diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
| commit | d11e43f81780987e325681b746fd5a4e7de3ff8a (patch) | |
| tree | 47c8ec8378dc1904191157dd4863dbbca5281307 | |
| parent | 7489513a8dfad70d90bc147a69cedfedfe49ae5c (diff) | |
| parent | c81ad5e33a6a7b25868d0eb56aae39a1bfb73760 (diff) | |
CWS-TOOLING: integrate CWS sb118
| -rw-r--r-- | odk/util/makefile.mk | 2 | ||||
| -rw-r--r-- | odk/util/makefile.pmk | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk index ed836730..7f6517ed 100644 --- a/odk/util/makefile.mk +++ b/odk/util/makefile.mk @@ -24,9 +24,7 @@ ALLTAR:\ $(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS) cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@ -.ENDIF # "$(USE_SHELL)"!="4nt" # cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . -x "idl/*" $(CHECKZIPRESULT) # cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/odkidl.zip idl/* $(CHECKZIPRESULT) diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 825f09b7..aa0f10ed 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -210,11 +210,8 @@ INCLUDEFILELIST=\ $(INCOUT)/com/sun/star/uno/Type.h \ $(INCOUT)/com/sun/star/uno/Type.hxx -QOB=\( -QCB=\) - INCLUDELIST:=\ - {$(subst,/,/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! $(QOB) -name "*~" -o -name "*build.lst" -o -name "*deliver.log" $(QCB) -print))} \ + {$(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! \( -name "*~" -o -name "*build.lst" -o -name "*deliver.log" \) -print)} \ $(INCLUDEFILELIST) SDK_CONTENT_CHECK_FILES= \ |