From d305e04cd729699886ed7ba89ddd493f65168a4d Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 3 Jul 2009 18:06:42 +0200 Subject: # i103316# don't require minor extension; rename source root --- solenv/inc/set_wntx64.mk | 2 +- solenv/inc/settings.mk | 52 ++++++++++++++++++++++++------------------------ 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 808b5b2aee18..585a745aaa70 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -140,7 +140,7 @@ L_X64=$(SOLARLIBDIR_X64) VERSIONOBJ_X64=$(SLO_X64)$/_version.obj BIN_X64=$(BIN)$/x64 RES_X64=$(RES)$/x64 -SOLARLIBDIR_X64=$(SOLARVERSION)$/$(INPATH)$/lib$(EXT_UPDMINOR)$/x64 +SOLARLIBDIR_X64=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)$/x64 LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64) .IF "$(LIBTARGET)"=="" diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 94623d259906..609c7085b88a 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -780,37 +780,37 @@ BIN=$(PRJ)$/$(OUTPATH).xl$/bin # damit gezielt Abhaengigkeiten auf s: angegeben werden koennen .IF "$(common_build)"!="" -SOLARIDLDIR=$(SOLARVERSION)$/common$(PROEXT)$/idl$(EXT_UPDMINOR) +SOLARIDLDIR=$(SOLARVERSION)$/common$(PROEXT)$/idl$(UPDMINOREXT) .ELSE -SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(EXT_UPDMINOR) +SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(UPDMINOREXT) .ENDIF -.IF "$(UPDMINOR)" != "" -EXT_UPDMINOR=.$(UPDMINOR) -.ELSE -EXT_UPDMINOR= -.ENDIF -SOLARRESDIR=$(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR) -SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR) -SOLARLIBDIR=$(SOLARVERSION)$/$(INPATH)$/lib$(EXT_UPDMINOR) -SOLARJAVADIR=$(SOLARVERSION)$/$(INPATH)$/java$(EXT_UPDMINOR) -SOLARINCDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(EXT_UPDMINOR) -SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(EXT_UPDMINOR) +#.IF "$(UPDMINOR)" != "" +#UPDMINOREXT=.$(UPDMINOR) +#.ELSE +#UPDMINOREXT= +#.ENDIF +SOLARRESDIR=$(SOLARVERSION)$/$(INPATH)$/res$(UPDMINOREXT) +SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(UPDMINOREXT) +SOLARLIBDIR=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) +SOLARJAVADIR=$(SOLARVERSION)$/$(INPATH)$/java$(UPDMINOREXT) +SOLARINCDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) +SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) .IF "$(SOLARLANG)"!="deut" .IF "$(SOLARLANG)" != "" -SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(EXT_UPDMINOR)$/$(SOLARLANG) -SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR)$/$(SOLARLANG) -.ENDIF -.ENDIF -SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(EXT_UPDMINOR) -SOLARUCRDIR=$(SOLARVERSION)$/$(INPATH)$/ucr$(EXT_UPDMINOR) -SOLARPARDIR=$(SOLARVERSION)$/$(INPATH)$/par$(EXT_UPDMINOR) -SOLARXMLDIR=$(SOLARVERSION)$/$(INPATH)$/xml$(EXT_UPDMINOR) -SOLARDOCDIR=$(SOLARVERSION)$/$(INPATH)$/doc$(EXT_UPDMINOR) -SOLARPCKDIR=$(SOLARVERSION)$/$(INPATH)$/pck$(EXT_UPDMINOR) -SOLARCOMMONBINDIR=$(SOLARVERSION)$/common$(PROEXT)$/bin$(EXT_UPDMINOR) -SOLARCOMMONRESDIR=$(SOLARVERSION)$/common$(PROEXT)$/res$(EXT_UPDMINOR) -SOLARCOMMONPCKDIR=$(SOLARVERSION)$/common$(PROEXT)$/pck$(EXT_UPDMINOR) +SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(SOLARLANG) +SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(UPDMINOREXT)$/$(SOLARLANG) +.ENDIF +.ENDIF +SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT) +SOLARUCRDIR=$(SOLARVERSION)$/$(INPATH)$/ucr$(UPDMINOREXT) +SOLARPARDIR=$(SOLARVERSION)$/$(INPATH)$/par$(UPDMINOREXT) +SOLARXMLDIR=$(SOLARVERSION)$/$(INPATH)$/xml$(UPDMINOREXT) +SOLARDOCDIR=$(SOLARVERSION)$/$(INPATH)$/doc$(UPDMINOREXT) +SOLARPCKDIR=$(SOLARVERSION)$/$(INPATH)$/pck$(UPDMINOREXT) +SOLARCOMMONBINDIR=$(SOLARVERSION)$/common$(PROEXT)$/bin$(UPDMINOREXT) +SOLARCOMMONRESDIR=$(SOLARVERSION)$/common$(PROEXT)$/res$(UPDMINOREXT) +SOLARCOMMONPCKDIR=$(SOLARVERSION)$/common$(PROEXT)$/pck$(UPDMINOREXT) .IF "$(common_build)"=="" SOLARCOMMONBINDIR=$(SOLARBINDIR) SOLARCOMMONRESDIR=$(SOLARRESDIR) -- cgit From e50d6c5c9548db2e0a31150c6c1e9e1386395b95 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 7 Aug 2009 14:42:01 +0200 Subject: #i103316#, #i103805# - avoid absolute path in tg_srs.mk; rework localize.sdf detection --- solenv/inc/_tg_srs.mk | 20 ++++++++--------- solenv/inc/settings.mk | 59 +++++++++++++++++++++++++------------------------- solenv/inc/target.mk | 28 +++++++++++++----------- solenv/inc/tg_srs.mk | 2 +- 4 files changed, 56 insertions(+), 53 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk index 5ffdaea6b88d..070a07a90fb0 100644 --- a/solenv/inc/_tg_srs.mk +++ b/solenv/inc/_tg_srs.mk @@ -28,7 +28,7 @@ $(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -83,7 +83,7 @@ $(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -138,7 +138,7 @@ $(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -193,7 +193,7 @@ $(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -248,7 +248,7 @@ $(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -303,7 +303,7 @@ $(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -358,7 +358,7 @@ $(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -413,7 +413,7 @@ $(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -468,7 +468,7 @@ $(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -523,7 +523,7 @@ $(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10F $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 6918dcb48c37..86d4d4668df3 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -650,34 +650,6 @@ MISC=$(OUT)$/misc COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))} .ENDIF -L10N_MODULE*=l10n -ALT_L10N_MODULE*=l10n_so - -.IF "$(WITH_LANG)"!="" -.INCLUDE .IGNORE: $(SOLARSRC)$/$(L10N_MODULE)/localization_present.mk -.INCLUDE .IGNORE: $(SOLARSRC)$/$(ALT_L10N_MODULE)/localization_present.mk - -#.IF "$(USE_SHELL)"!="4nt" -#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ);pwd)$/,$(NULL) $(PWD)) -#.ELSE # "$(USE_SHELL)"!="4nt" -#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) ^ echo %_cwd)$/,$(NULL) $(PWD)) -#.ENDIF # "$(USE_SHELL)"!="4nt" -.IF "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" -TRYSDF:=$(SOLARSRC)$/$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf -.IF "$(ALT_LOCALIZATION_FOUND)"!="" -TRYALTSDF:=$(SOLARSRC)$/$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf -# TODO: check performance impact... -LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI))) -.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!="" -some_local_helper_var:=$(strip $(shell +$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) )) -LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(some_local_helper_var) $(LOCALIZESDF)) -LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf $(LOCALIZESDF)) -.ELSE # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" -LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf -.ENDIF # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" -.ENDIF # "$(WITH_LANG)"!="" - - OUTCXX=$(OUT)$/cxx .IF "$(PACKAGE)"!="" @@ -798,7 +770,6 @@ SRSX=$(OUT)$/srs # Resource-Pfad fuer .RC und .RES RES=$(OUT)$/res - # das normale MISC wird nicht an LDMISC angepasst, stattdessen MISCX .IF "$(make_xl)"!="" @@ -850,6 +821,36 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR) .EXPORT : SOLARBINDIR +L10N_MODULE*=$(SOLARSRC)$/l10n +ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so + +.IF "$(WITH_LANG)"!="" +.INCLUDE .IGNORE: $(L10N_MODULE)/localization_present.mk +.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/localization_present.mk + +# check for localizations not hosted in l10n module. if a file exists there +# it won't in l10n +.IF "$(ALT_LOCALIZATION_FOUND)"!="" +TRYALTSDF:=$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf +LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI))) +.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!="" +# if the l10n module exists, use split localize.sdf directly from there +.IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"=="" +# still check for existence as there may be no localization yet +TRYSDF:=$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf +LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI))) +.ENDIF # "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"=="" +# else use localize.sdf from local output tree if localization .zip exists +.IF "$(LOCALIZESDF)"=="" +LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf +LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI))) +.ENDIF # "$(LOCALIZESDF)"=="" +# dummy target to keep the build happy. +.IF "$(LOCALIZESDF)"=="" +LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf +.ENDIF # "$(LOCALIZESDF)"=="" +.ENDIF # "$(WITH_LANG)"!="" + .IF "$(PRE)"=="" #JARDIR=$(CLASSDIR) JARDIR=$(OUT)$/class diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 0264ac9bb7c6..b0fabb84d649 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1389,24 +1389,26 @@ $(UNIXTEXT) : $(UNIXTEXT:f) .ENDIF # "$(UNIXTEXT)"!="" .IF "$(WITH_LANG)"!="" -.IF "$(LOCALIZATION_FOUND)"=="" .IF "$(LOCALIZESDF)"!="" -"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip + +# dummy target to keep the build happy if not even the .zip exists. localization tools deal with not existing +# localize.sdf themself +$(LOCALIZESDF)%: + @echo $(LOCALIZESDF) @@-$(MKDIRHIER) $(@:d) - @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET) - @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip - @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)$/* $(COMMONMISC)$/$(PRJNAME) - @@-$(RM) -rf $(COMMONMISC)$/$(PRJNAME)_$(TARGET) -.ENDIF # "$(LOCALIZESDF)"!="" -.ENDIF # "$(LOCALIZATION_FOUND)"=="" -.ENDIF # "$(WITH_LANG)"!="" -.IF "$(LOCALIZESDF)"!="" -"$(LOCALIZESDF)%" : - echo $(LOCALIZESDF) +.IF "$(LOCALIZATION_FOUND)"=="" +.IF "$(LOCALSDFFILE)"!="" +$(LOCALSDFFILE) : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) - @$(TOUCH) $(LOCALIZESDF) + @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET) + -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) + $(TOUCH) $@ + +.ENDIF # "$(LOCALSDFFILE)"!="" +.ENDIF # "$(LOCALIZATION_FOUND)"=="" .ENDIF # "$(LOCALIZESDF)"!="" +.ENDIF # "$(WITH_LANG)"!="" .IF "$(EXTUPDATEINFO_NAME)"!="" $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE) diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk index 50db37401358..d5e757cda3ae 100644 --- a/solenv/inc/tg_srs.mk +++ b/solenv/inc/tg_srs.mk @@ -60,7 +60,7 @@ $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTIC $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -- cgit From b1f9477fa2f4e9dd764966f595ae7a2c861041ea Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 28 Sep 2009 17:54:12 +0200 Subject: fixed broken manuan merge --- solenv/inc/settings.mk | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 3a8829448113..7c762c7e1eaa 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -646,29 +646,6 @@ MISC=$(OUT)/misc COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))} .ENDIF -L10N_MODULE*=l10n -ALT_L10N_MODULE*=l10n_so - -.IF "$(WITH_LANG)"!="" -.INCLUDE .IGNORE: $(SOLARSRC)/$(L10N_MODULE)/localization_present.mk -.INCLUDE .IGNORE: $(SOLARSRC)/$(ALT_L10N_MODULE)/localization_present.mk - -.IF "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" -TRYSDF:=$(SOLARSRC)/$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf -.IF "$(ALT_LOCALIZATION_FOUND)"!="" -TRYALTSDF:=$(SOLARSRC)/$(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf -# TODO: check performance impact... -LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI))) -.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!="" -some_local_helper_var:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) )) -LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(some_local_helper_var) $(LOCALIZESDF)) -LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf $(LOCALIZESDF)) -.ELSE # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" -LOCALIZESDF:=$(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf -.ENDIF # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" -.ENDIF # "$(WITH_LANG)"!="" - - OUTCXX=$(OUT)/cxx .IF "$(PACKAGE)"!="" @@ -808,12 +785,12 @@ SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT) #.ELSE #UPDMINOREXT= #.ENDIF -SOLARRESDIR=$(SOLARVERSION)/gc$(INPATH)/res$(UPDMINOREXT) -SOLARRESXDIR=$(SOLARVERSION)/gc$(INPATH)/res$(UPDMINOREXT) -SOLARLIBDIR=$(SOLARVERSION)/gc$(INPATH)/lib$(UPDMINOREXT) -SOLARJAVADIR=$(SOLARVERSION)/gc$(INPATH)/java$(UPDMINOREXT) -SOLARINCDIR=$(SOLARVERSION)/gc$(INPATH)/inc$(UPDMINOREXT) -SOLARINCXDIR=$(SOLARVERSION)/gc$(INPATH)/inc$(UPDMINOREXT) +SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT) +SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT) +SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) +SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java$(UPDMINOREXT) +SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) +SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) .IF "$(SOLARLANG)"!="deut" .IF "$(SOLARLANG)" != "" SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(SOLARLANG) -- cgit From 7535d77f6ae33900822e50eb349243008b931aa9 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 28 Sep 2009 18:00:47 +0200 Subject: fixed broken manual merge --- solenv/inc/target.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 705368b3b4e3..be919e591bcf 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1396,9 +1396,8 @@ $(UNIXTEXT) : $(UNIXTEXT:f) $(LOCALIZESDF)%: @echo $(LOCALIZESDF) @@-$(MKDIRHIER) $(@:d) + $(TOUCH) $@ -.IF "$(LOCALIZATION_FOUND)"=="" -.IF "$(LOCALIZESDF)"!="" "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET) -- cgit From e595f151ec4496dd3ca5983cfac6e9fe79097db2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 8 Oct 2009 15:53:01 +0000 Subject: #i105736# remove -fno-use-cxa-atexit --- solenv/inc/unxlnga.mk | 1 - solenv/inc/unxlngm68k.mk | 2 +- solenv/inc/unxlngr.mk | 1 - solenv/inc/unxlngx.mk | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk index 6baf600fee35..99074c01bd4e 100644 --- a/solenv/inc/unxlnga.mk +++ b/solenv/inc/unxlnga.mk @@ -33,5 +33,4 @@ .INCLUDE : unxlng.mk CFLAGS+=-DIA64 -CFLAGSCXX+=-fno-use-cxa-atexit DLLPOSTFIX=la diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk index a206d61543b2..25d5118839e4 100644 --- a/solenv/inc/unxlngm68k.mk +++ b/solenv/inc/unxlngm68k.mk @@ -37,5 +37,5 @@ PICSWITCH:=-fPIC CDEFS+=-DM68K CFLAGS+=-fsigned-char -fno-omit-frame-pointer CFLAGSCC+=-fsigned-char -CFLAGSCXX+=-fsigned-char -fno-use-cxa-atexit +CFLAGSCXX+=-fsigned-char DLLPOSTFIX=lm diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk index 8a82cefb0b14..b108888d190b 100644 --- a/solenv/inc/unxlngr.mk +++ b/solenv/inc/unxlngr.mk @@ -35,5 +35,4 @@ CDEFAULTOPT=-Os .INCLUDE : unxlng.mk CDEFS+=-DARM32 CFLAGS+=-fno-omit-frame-pointer -CFLAGSCXX+=-fno-use-cxa-atexit DLLPOSTFIX=lr diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk index 5bb9f5b198b2..ba74a55cfdc3 100644 --- a/solenv/inc/unxlngx.mk +++ b/solenv/inc/unxlngx.mk @@ -33,7 +33,6 @@ .INCLUDE : unxlng.mk CDEFS+=-DX86_64 -CFLAGSCXX+=-fno-use-cxa-atexit MODULES_WITH_WARNINGS+=\ svx DLLPOSTFIX=lx -- cgit From 4fe7299cc07e7798cfcd56f8333a623b4440ca0d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 14 Oct 2009 11:26:26 +0000 Subject: #i105899# get ia64 to build --- solenv/inc/unxfbsdx.mk | 1 + solenv/inc/unxlnga.mk | 1 + 2 files changed, 2 insertions(+) (limited to 'solenv/inc') diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk index 61edc8dcaf51..62817d5604fc 100644 --- a/solenv/inc/unxfbsdx.mk +++ b/solenv/inc/unxfbsdx.mk @@ -50,3 +50,4 @@ CFLAGSOPT= # no optimizing for non products # platform specific identifier for shared libs DLLPOSTFIX=fx +BUILD64=1 diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk index 99074c01bd4e..2f18fe7b43c6 100644 --- a/solenv/inc/unxlnga.mk +++ b/solenv/inc/unxlnga.mk @@ -34,3 +34,4 @@ .INCLUDE : unxlng.mk CFLAGS+=-DIA64 DLLPOSTFIX=la +BUILD64=1 -- cgit From cba9d87925a062b6e03849bb184bf1d41845b655 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 20 Oct 2009 08:55:11 +0000 Subject: CWS-TOOLING: rebase CWS cmcfixes64 to trunk@277035 (milestone: DEV300:m62) --- solenv/inc/libs.mk | 2 +- solenv/inc/minor.mk | 6 +++--- solenv/inc/unxmacxi.mk | 7 +++++++ solenv/inc/wntgcci.mk | 33 ++++++++++++++++++++++++++------- 4 files changed, 37 insertions(+), 11 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index e93b23c54af0..cce1aac0ea6e 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -172,7 +172,7 @@ NSPR4LIB=-lnspr4 PLC4LIB=-lplc4 NSSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-NSS) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB) .IF "$(GUI)$(COM)"=="WNTGCC" -XMLSECLIB-MS=-lxmlsec1-mscrypto-1 +XMLSECLIB-MS=-lxmlsec1-mscrypto MSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-MS) $(CRYPT32LIB) $(ADVAPI32LIB) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" BROOKERLIB=-lbrooker$(DLLPOSTFIX) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index db285c37c836..dbebc6253ed3 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m61(Build:9427) -BUILD=9427 -LAST_MINOR=m61 +RSCREVISION=300m62(Build:9433) +BUILD=9433 +LAST_MINOR=m62 SOURCEVERSION=DEV300 diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk index c843d24e7c82..6d27121366e5 100644 --- a/solenv/inc/unxmacxi.mk +++ b/solenv/inc/unxmacxi.mk @@ -52,5 +52,12 @@ CFLAGSENABLESYMBOLS=-g1 .ELSE CFLAGSENABLESYMBOLS=-g .ENDIF + +.IF "$(SNOW_LEOPARD_10_4)"!="" +JAVACOMPILER+=-target 1.5 +DYLD_INSERT_LIBRARIES=/usr/lib/libsqlite3.dylib +.EXPORT: DYLD_INSERT_LIBRARIES +.ENDIF # "$(SNOW_LEOPARD_10_4)"!="" + # Include generic Mac OS X makefile .INCLUDE : unxmacx.mk diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index ef0c5ce2854d..b45b659d5f84 100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -81,7 +81,10 @@ CFLAGSNOOPT=-O0 # Compiler flags for describing the output path CFLAGSOUTOBJ=-o #plattform hart setzen -CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED +CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED +.IF "$(DYNAMIC_CRT)"!="" +CDEFS+=-D_DLL +.ENDIF # -Wshadow does not work for C with nested uses of pthread_cleanup_push: CFLAGSWARNCC=-Wall -Wextra -Wendif-labels @@ -117,6 +120,8 @@ MINGWLIBDIR=$(COMPATH)$/lib$/mingw .ELSE MINGWLIBDIR=$(COMPATH)$/lib .ENDIF +MINGWSSTDOBJ=$(MINGW_CLIB_DIR)$/crtbegin.o +MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)$/crtend.o LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o @@ -126,19 +131,33 @@ LINKFLAGSPROF= LINKFLAGSDEBUG=-g LINKFLAGSOPT= +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" +STDLIBCPP=-lstdc++_s +.ELSE STDLIBCPP=-lstdc++ +.ENDIF UWINAPILIB*=$(DYNAMIC) -luwinapi +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" +MINGW_LIBGCC=-lgcc_s -lgcc +LINKFLAGS+=-shared-libgcc +.ELSE +.IF "$(MINGW_GCCLIB_EH)"=="YES" +MINGW_LIBGCC=-lgcc_eh -lgcc +.ELSE +MINGW_LIBGCC=-lgcc +.ENDIF +.ENDIF STDOBJVCL=$(L)$/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= STDSLOCUI= -STDLIBGUIMT=-Wl,--start-group CPPRUNTIME -lgcc -STDLIBCUIMT=-Wl,--start-group CPPRUNTIME -lgcc -STDSHLGUIMT=-Wl,--start-group CPPRUNTIME -lgcc -STDSHLCUIMT=-Wl,--start-group CPPRUNTIME -lgcc -.IF "$(MINGW_NODLL)"=="" +STDLIBGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) +STDLIBCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) +STDSHLGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) +STDSHLCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) +.IF "$(DYNAMIC_CRT)"!="" STDLIBGUIMT+=-lmingwthrd STDLIBCUIMT+=-lmingwthrd STDSHLGUIMT+=-lmingwthrd @@ -150,7 +169,7 @@ STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -l STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt LIBSTLPORT=-lstlport_gcc -LIBSTLPORTST=-lstlport_gcc_static +LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP) LIBMGR=ar LIBFLAGS=-rsu -- cgit From 8f66e50a5bd9054007637c879acce33644080819 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 26 Oct 2009 16:32:31 +0100 Subject: ause109: #i106296# introduce TARFILE_LOCATION to find source tarballs --- solenv/inc/tg_ext.mk | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index b0096d799161..7535b8bad799 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -68,6 +68,9 @@ fake_root_dir=/$(TARFILE_NAME) fake_back=../ .ENDIF "$(TARFILE_IS_FLAT)" != "" +TARFILE_LOCATION*=$(BACK_PATH)$(fake_back)download +TARFILE_LOCATION2=$(eq,$(BACK_PATH)$(fake_back)download,$(TARFILE_LOCATION) $(PRJ)/download $(TARFILE_LOCATION)) + P_CONFIGURE_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(CONFIGURE_DIR) P_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR) P_INSTALL_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR) @@ -112,56 +115,56 @@ clean: cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) clean $(RM) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) -$(MISC)/%.unpack : $(PRJ)/download/%.tar.bz2 +$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2 @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)/%.unpack : $(PRJ)/download/%.tar.Z +$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)/%.unpack : $(PRJ)/download/%.tar.gz +$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.gz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)/%.unpack : $(PRJ)/download/%.tgz +$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tgz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)/%.unpack : $(PRJ)/download/%.tar +$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar @-$(RM) $@ - noop $(assign UNPACKCMD := $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar) + noop $(assign UNPACKCMD := $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_NAME).tar) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)/%.unpack : $(PRJ)/download/%.zip +$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip @-$(RM) $@ - noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).zip) + noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_NAME).zip) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)/%.unpack : $(PRJ)/download/%.jar +$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar @-$(RM) $@ .IF "$(OS)"=="SOLARIS" - noop $(assign UNPACKCMD := jar xf $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar) + noop $(assign UNPACKCMD := jar xf $(TARFILE_LOCATION)/$(TARFILE_NAME).jar) .ELSE # "$(OS)"=="SOLARIS" - noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar) + noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_NAME).jar) .ENDIF # "$(OS)"=="SOLARIS" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -- cgit From 306ac896af18d7c70a9d5bcf8a75bcb9c4a730ef Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Mon, 16 Nov 2009 01:20:32 +0100 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index eb479d4adafb..542c3d16be86 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m64(Build:9446) -BUILD=9446 -LAST_MINOR=m64 +RSCREVISION=300m65(Build:9457) +BUILD=9457 +LAST_MINOR=m65 SOURCEVERSION=DEV300 -- cgit From 57f9b4fffac7a86aec79b8c5eefc4e31d1ffacc2 Mon Sep 17 00:00:00 2001 From: Vladimir Glazunov Date: Mon, 16 Nov 2009 15:38:48 +0100 Subject: masterfix: #i10000# wrong conflict resolution, here or in the cws ause10* --- solenv/inc/target.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 4516959e6cbc..eb4b35008e8a 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1393,17 +1393,20 @@ $(UNIXTEXT) : $(UNIXTEXT:f) # dummy target to keep the build happy if not even the .zip exists. localization tools deal with not existing # localize.sdf themself -$(LOCALIZESDF)%: +"$(LOCALIZESDF)%": @echo $(LOCALIZESDF) @@-$(MKDIRHIER) $(@:d) $(TOUCH) $@ +.IF "$(LOCALIZATION_FOUND)"=="" +.IF "$(LOCALSDFFILE)"!="" "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET) - @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(FI) - @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)/* $(COMMONMISC)/$(PRJNAME) - @@-$(RM) -rf $(COMMONMISC)/$(PRJNAME)_$(TARGET) + @-unzip -o -d $(COMMONMISC)/$(PRJNAME) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(subst,$(COMMONMISC)/$(PRJNAME)/, $@) + @@$(TOUCH) $@ +.ENDIF # "$(LOCALSDFFILE)"!="" +.ENDIF # "$(LOCALIZATION_FOUND)"=="" .ENDIF # "$(LOCALIZESDF)"!="" .ENDIF # "$(WITH_LANG)"!="" -- cgit From 329fca3ae435ce21801480984ecd52603728a8a9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 19 Nov 2009 15:41:16 +0000 Subject: linuxhppa1: #i107051#: port to linux hppa (parisc) --- solenv/inc/unx.mk | 4 ++++ solenv/inc/unxlnghppa.mk | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 solenv/inc/unxlnghppa.mk (limited to 'solenv/inc') diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 718e23c01b4e..bb5a4864484d 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -179,6 +179,10 @@ .INCLUDE : unxlngm68k.mk .ENDIF +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXH" +.INCLUDE : unxlnghppa.mk +.ENDIF + # --- general *ix settings --- HC=hc HCFLAGS= diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk new file mode 100644 index 000000000000..240eef609365 --- /dev/null +++ b/solenv/inc/unxlnghppa.mk @@ -0,0 +1,39 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: unxlnghppa.mk,v $ +# +# $Revision: 1.2 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# mk file for Unix Linux HPPA using GCC, please make generic modifications to unxlng.mk +PICSWITCH:=-fPIC +.INCLUDE : unxlng.mk +CDEFS+=-DHPPA +CFLAGS+= +CFLAGSCC+= +CFLAGSCXX+= +DLLPOSTFIX=lh -- cgit From 9c04b6cd80785b0aab3f77c3f8cd9541dd9c6ab1 Mon Sep 17 00:00:00 2001 From: Vladimir Glazunov Date: Thu, 26 Nov 2009 14:57:09 +0100 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 542c3d16be86..b952cb5586fb 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m65(Build:9457) -BUILD=9457 -LAST_MINOR=m65 +RSCREVISION=300m66(Build:9460) +BUILD=9460 +LAST_MINOR=m66 SOURCEVERSION=DEV300 -- cgit From 9dc3b523990a426644fab1a7288317f62404232b Mon Sep 17 00:00:00 2001 From: Ruediger Timm Date: Mon, 30 Nov 2009 11:42:24 +0100 Subject: #i10000# Error in generating shell output for compiling generated files. --- solenv/inc/rules.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'solenv/inc') diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 71909c8d348b..7b8e6f2aaadd 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -224,7 +224,7 @@ $(SLO)/%.obj : %.cpp .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cxx - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -249,7 +249,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cc - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc @@ -266,7 +266,7 @@ $(SLO)/%.obj : $(MISC)/%.cc .ENDIF $(OBJ)/%.obj : $(MISC)/%.cxx - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -321,7 +321,7 @@ $(OBJ)/%.obj : %.c .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : $(MISC)/%.c - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c @@ -343,7 +343,7 @@ $(OBJ)/%.obj : $(MISC)/%.c .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.c - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c @@ -404,7 +404,7 @@ $(OBJ)/%.obj : %.m # Objective-C files $(OBJ)/%.obj : $(MISC)/%.m - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m @@ -415,7 +415,7 @@ $(OBJ)/%.obj : $(MISC)/%.m # Objective-C files $(SLO)/%.obj : $(MISC)/%.m - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m @@ -461,7 +461,7 @@ $(OBJ)/%.obj : %.mm # Objective-C++ files $(OBJ)/%.obj : $(MISC)/%.mm - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm @@ -476,7 +476,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : $(MISC)/%.mm - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm -- cgit