diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:15:26 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:15:26 +0000 |
| commit | 6fb2ff3cb562be92b10c7b4a7b9d3a700c4c1efe (patch) | |
| tree | 9eed276863454b28cfaec685e447cceb6ad51d63 /solenv/inc/tg_zip.mk | |
| parent | 095e4e45e3cf697558bb81f6c8db6c64c57fd57e (diff) | |
INTEGRATION: CWS ause084_DEV300 (1.37.46); FILE MERGED
2007/12/20 15:12:58 hjs 1.37.46.3: #i77202# COMMONBIN won't work when changing common_build_zip in local makefile
2007/12/17 16:37:46 hjs 1.37.46.2: #i77202# minor cleanup using variables supplied by settings.mk
2007/12/17 16:31:06 hjs 1.37.46.1: #i77202# removed specialcasing of PRJ=.; less copying around of archives
Diffstat (limited to 'solenv/inc/tg_zip.mk')
| -rw-r--r-- | solenv/inc/tg_zip.mk | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index 1deb3978e32f..04a2d5f61477 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_zip.mk,v $ # -# $Revision: 1.38 $ +# $Revision: 1.39 $ # -# last change: $Author: kz $ $Date: 2008-03-05 16:34:23 $ +# last change: $Author: kz $ $Date: 2008-03-06 15:15:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -89,17 +89,9 @@ ZIP$(TNR)TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP$(TNR)TARGET).dpzz : $(ZIP$(TNR)TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP$(TNR)HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP$(TNR)TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP$(TNR)HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP$(TNR)TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP$(TNR)HELPVAR=$(COMMONBIN)$/$(ZIP$(TNR)TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP$(TNR)HELPVAR=$(BIN)$/$(ZIP$(TNR)TARGET) -.ELSE # "$(PRJ)"=="." -ZIP$(TNR)HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP$(TNR)TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP$(TNR)DEPFILE) : @@ -136,19 +128,22 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS) .IF "$(ZIP$(TNR)DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away$/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@.$(INPATH) $(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) .ELSE # "$(ZIP$(TNR)DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP$(TNR)DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP$(TNR)DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" + echo mmm{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP$(TNR)HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away$/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@ |