i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add more missing 'local's to variable declarations.

Browse Source
This commit is contained in:
Oliver Tappe
2014-08-13 13:32:43 +02:00
parent afde44733f
commit 938bf9fad2
6 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ConfigRules
+2
View File
@@ -128,6 +128,7 @@ rule PrepareSubDirConfigVariables
: __inherited_config__ ] ; : __inherited_config__ ] ;
on [ ConfigObject $(parentDir) : __inherited_config__ ] { on [ ConfigObject $(parentDir) : __inherited_config__ ] {
local var ;
for var in $(AUTO_SET_UP_CONFIG_VARIABLES) { for var in $(AUTO_SET_UP_CONFIG_VARIABLES) {
$(var) on $(config) ?= $($(var)) ; $(var) on $(config) ?= $($(var)) ;
$(var) on $(inheritedConfig) ?= $($(var)) ; $(var) on $(inheritedConfig) ?= $($(var)) ;
@@ -147,6 +148,7 @@ rule PrepareConfigVariables
local rootConfig = [ ConfigObject ] ; # the root config object local rootConfig = [ ConfigObject ] ; # the root config object
local inheritedRootConfig = [ ConfigObject : __inherited_config__ ] ; local inheritedRootConfig = [ ConfigObject : __inherited_config__ ] ;
local var ;
for var in $(AUTO_SET_UP_CONFIG_VARIABLES) { for var in $(AUTO_SET_UP_CONFIG_VARIABLES) {
$(var) on $(rootConfig) = $($(var)) ; $(var) on $(rootConfig) = $($(var)) ;
$(var) on $(inheritedRootConfig) = $($(var)) ; $(var) on $(inheritedRootConfig) = $($(var)) ;
build/jam/ImageRules
+1
View File
@@ -488,6 +488,7 @@ rule AddDriversToContainer container : relativeDirectoryTokens : targets
# get the relative symlink path prefix # get the relative symlink path prefix
local linkPrefix = ; local linkPrefix = ;
local i ;
for i in $(relativeDirectoryTokens) { for i in $(relativeDirectoryTokens) {
linkPrefix += .. ; linkPrefix += .. ;
} }
build/jam/MathRules
+1
View File
@@ -584,6 +584,7 @@ rule Expr expression
# tokenize the expression # tokenize the expression
local tokens ; local tokens ;
local string ;
for string in $(expression) { for string in $(expression) {
while $(string) { while $(string) {
local split = [ Match "[ \t]*(-|[()+*]|[0-9]*)(.*)" : $(string) ] ; local split = [ Match "[ \t]*(-|[()+*]|[0-9]*)(.*)" : $(string) ] ;
build/jam/RepositoryRules
+1
View File
@@ -184,6 +184,7 @@ rule RemotePackageRepository repository : architecture : repositoryUrl
on $(packageListFile) return $(HAIKU_REPOSITORY_PACKAGE_FILE_NAMES) on $(packageListFile) return $(HAIKU_REPOSITORY_PACKAGE_FILE_NAMES)
] ; ] ;
local packageFiles ; local packageFiles ;
local packageFile ;
for packageFile in $(packageFileNames) { for packageFile in $(packageFileNames) {
MakeLocate $(packageFile) : $(HAIKU_DOWNLOAD_DIR) ; MakeLocate $(packageFile) : $(HAIKU_DOWNLOAD_DIR) ;
packageFiles += $(packageFile) ; packageFiles += $(packageFile) ;
build/jam/packages/Haiku
+2
View File
@@ -6,6 +6,7 @@ HaikuPackage $(haikuPackage) ;
# wifi firmware # wifi firmware
local driver ;
for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) { for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ; local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ;
local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ; local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
@@ -16,6 +17,7 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
} }
local packages = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGES) ] ; local packages = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGES) ] ;
local archives = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVES) ] ; local archives = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVES) ] ;
local archive ;
for archive in $(archives) { for archive in $(archives) {
AddWifiFirmwareToPackage $(driver) : $(packages[1]) : $(archive) AddWifiFirmwareToPackage $(driver) : $(packages[1]) : $(archive)
: $(extract) ; : $(extract) ;
build/jam/packages/HaikuBootstrap
+2
View File
@@ -6,6 +6,7 @@ HaikuPackage $(haikuPackage) ;
# wifi firmware # wifi firmware
local driver ;
for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) { for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ; local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ;
local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ; local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
@@ -16,6 +17,7 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
} }
local packages = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGES) ] ; local packages = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGES) ] ;
local archives = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVES) ] ; local archives = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVES) ] ;
local archive ;
for archive in $(archives) { for archive in $(archives) {
AddWifiFirmwareToPackage $(driver) : $(packages[1]) : $(archive) AddWifiFirmwareToPackage $(driver) : $(packages[1]) : $(archive)
: $(extract) ; : $(extract) ;