* Remove now unneeded (hopefully) timezone data
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37769 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -82,22 +82,19 @@ HAIKU_DEFAULT_ANYBOOT_LABEL ?= Haiku ;
|
||||
ProcessCommandLineArguments ;
|
||||
|
||||
|
||||
# include Timezones/libgccObjects
|
||||
# include libgccObjects
|
||||
{
|
||||
local timezones = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : Timezones ] ;
|
||||
local libgccObjects = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : libgccObjects ] ;
|
||||
|
||||
if ! ( $(timezones) && $(libgccObjects) ) {
|
||||
ECHO "No `Timezones' or `libgccObjects' found in"
|
||||
if ! $(libgccObjects) {
|
||||
ECHO "No `libgccObjects' found in"
|
||||
"$(HAIKU_BUILD_OUTPUT_DIR)!" ;
|
||||
EXIT "Please run ./configure in the source tree's root directory"
|
||||
"again!" ;
|
||||
}
|
||||
|
||||
LOCATE on Timezones = $(HAIKU_BUILD_OUTPUT_DIR) ;
|
||||
LOCATE on libgccObjects = $(HAIKU_BUILD_OUTPUT_DIR) ;
|
||||
|
||||
include Timezones ;
|
||||
include libgccObjects ;
|
||||
}
|
||||
|
||||
|
||||
@@ -465,12 +465,6 @@ local keyboardLayoutsDir
|
||||
local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
|
||||
AddFilesToHaikuImage system data KeyboardLayouts : $(keyboardLayouts) ;
|
||||
|
||||
local timezones = [ FTimeZoneBinaries $(HAIKU_TIME_ZONE_SOURCES) : : true ] ;
|
||||
for timezone in $(timezones) {
|
||||
local dir = [ on $(timezone) return $(RELATIVE_TIMEZONE_DIR) ] ;
|
||||
AddFilesToHaikuImage system data timezones $(dir) : $(timezone) ;
|
||||
}
|
||||
|
||||
local driverSettingsFiles = <driver-settings>kernel ;
|
||||
SEARCH on $(driverSettingsFiles)
|
||||
= [ FDirName $(HAIKU_TOP) data settings kernel drivers ] ;
|
||||
|
||||
@@ -96,48 +96,6 @@ rule FSplitPath
|
||||
return $(components) ;
|
||||
}
|
||||
|
||||
rule FTimeZoneBinaries
|
||||
{
|
||||
local sources = $(1:G=timezone-source) ;
|
||||
local locate = $(2) ;
|
||||
local setRelativeTimezoneDir = $(3) ;
|
||||
|
||||
local gristedBinaries ;
|
||||
|
||||
local source ;
|
||||
for source in $(sources) {
|
||||
local binaries = [ on $(source) return $(TZ_OBJECTS) ] ;
|
||||
|
||||
local targetDir = [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR)
|
||||
data timezones ] ;
|
||||
|
||||
local binary ;
|
||||
for binary in $(binaries) {
|
||||
local dir = $(binary:D) ;
|
||||
if $(dir) {
|
||||
binary = $(binary:BSG=timezone!$(dir)) ;
|
||||
if $(locate) {
|
||||
LOCATE on $(binary) = [ FDirName $(targetDir) $(dir) ] ;
|
||||
}
|
||||
} else {
|
||||
binary = $(binary:BSG=timezone) ;
|
||||
if $(locate) {
|
||||
LOCATE on $(binary) = $(targetDir) ;
|
||||
}
|
||||
}
|
||||
|
||||
if $(setRelativeTimezoneDir) {
|
||||
RELATIVE_TIMEZONE_DIR on $(binary) = $(dir) ;
|
||||
}
|
||||
|
||||
gristedBinaries += $(binary) ;
|
||||
}
|
||||
}
|
||||
|
||||
return $(gristedBinaries) ;
|
||||
}
|
||||
|
||||
|
||||
rule SetPlatformCompatibilityFlagVariables
|
||||
{
|
||||
# SetPlatformCompatibilityFlagVariables <platform var> : <var prefix>
|
||||
|
||||
Reference in New Issue
Block a user