diff options
| author | Andras Timar <atimar@suse.com> | 2012-02-20 20:24:54 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-02-20 20:39:01 +0100 |
| commit | 24f63831af82e71133fae0fc8309d1f752a402bf (patch) | |
| tree | 0bba9aa9a1a6db1d7a8d10a7560cb6531046c2f9 /solenv/inc/tg_zip.mk | |
| parent | 8b55ef8898a39803e9c4a8cd6a271576389c0249 (diff) | |
remove cleanzip.pl
The issue it solves does not exist in our build environment.
https://issues.apache.org/ooo/show_bug.cgi?id=98365
The script removed g+s attributes from directories in zip files.
Diffstat (limited to 'solenv/inc/tg_zip.mk')
| -rw-r--r-- | solenv/inc/tg_zip.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index 0c01db71dbc9..8f2d4414fdfb 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -86,23 +86,15 @@ $(ZIP$(TNR)DEPFILE) : $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS) - @echo "Making: " $(@:f) + @echo "[ZIP]" $(@:f) @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)) - @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles - @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) ) .IF "$(ZIP$(TNR)DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(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 $(CHECKZIPRESULT) - $(COMMAND_ECHO)$(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \ - $(FI) $(COMMAND_ECHO)$(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@ $(COMMAND_ECHO)$(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) .ELSE # "$(ZIP$(TNR)DIR)" != "" $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(@:db))} $j )) -x delzip $(CHECKZIPRESULT) - $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ - $(FI) .IF "$(ZIP$(TNR)STRIPLANGUAGETAGS)" != "" $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \ $(SOLARENV)/bin/striplanguagetags.sh $@ \ |