INTEGRATION: CWS ause069 (1.21.60); FILE MERGED

2006/10/18 17:12:05 hjs 1.21.60.1: #i70359# remove forced shell calls
This commit is contained in:
Oliver Bolte 2007-01-25 11:29:53 +00:00
parent 7c31a07d66
commit c160cc9385

View file

@ -20,8 +20,8 @@ ALLTAR:\
$(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS) $(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS)
+cd $(BIN)$/$(PRODUCT_NAME) && $(WRAPCMD) zip -urq ..$/$(PRODUCTZIPFILE) . -x "idl/*" $(CHECKZIPRESULT) cd $(BIN)$/$(PRODUCT_NAME) && $(WRAPCMD) zip -urq ..$/$(PRODUCTZIPFILE) . -x "idl/*" $(CHECKZIPRESULT)
+cd $(BIN)$/$(PRODUCT_NAME) && $(WRAPCMD) zip -urq ..$/odkidl.zip idl/* $(CHECKZIPRESULT) cd $(BIN)$/$(PRODUCT_NAME) && $(WRAPCMD) zip -urq ..$/odkidl.zip idl/* $(CHECKZIPRESULT)
ODK_OO_FILES=\ ODK_OO_FILES=\
$(PRJ)$/index.html \ $(PRJ)$/index.html \
@ -50,5 +50,5 @@ ODK_OO_FILES=\
$(BIN)$/odk_oo.zip : $(ODK_OO_FILES) $(BIN)$/odk_oo.zip : $(ODK_OO_FILES)
+cd $(PRJ) && $(WRAPCMD) zip -urq $(subst,$(PRJ)$/, $(BIN)$/odk_oo.zip) $(subst,$(PRJ)$/, $<) $(CHECKZIPRESULT) cd $(PRJ) && $(WRAPCMD) zip -urq $(subst,$(PRJ)$/, $(BIN)$/odk_oo.zip) $(subst,$(PRJ)$/, $<) $(CHECKZIPRESULT)