diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:03:17 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:03:17 +0000 |
| commit | 72b73371d20be7b0a305204065f6c0135041f350 (patch) | |
| tree | deb3d5ffea29273e4a697ce3ff82c411a3afdf97 | |
| parent | 51dcc7d21b1f30d515f2e53f6b77d561f0b4844e (diff) | |
INTEGRATION: CWS jsc17 (1.7.124); FILE MERGED
2007/01/22 15:35:25 jsc 1.7.124.1: #i73750# change UNOPKG_EXT to UNOOXT_EXT
| -rw-r--r-- | odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile | 10 | ||||
| -rw-r--r-- | odk/examples/DevelopersGuide/Charts/Makefile | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile index 08f076f2f6ab..6716bed3be4a 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile @@ -2,9 +2,9 @@ # # $RCSfile: Makefile,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2005-03-29 12:07:49 $ +# last change: $Author: obo $ $Date: 2007-01-25 11:02:46 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -52,8 +52,8 @@ EXAMPLE_NAME=BaDCreatingDialogsExample OUT_COMP_CLASS = $(OUT_CLASS)/$(EXAMPLE_NAME) COMPONENT_NAME=SampleDialog -COMPONENT_PACKAGE = $(OUT_BIN)/$(COMPONENT_NAME).$(UNOPKG_EXT) -COMPONENT_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMPONENT_NAME).$(UNOPKG_EXT)") +COMPONENT_PACKAGE = $(OUT_BIN)/$(COMPONENT_NAME).$(UNOOXT_EXT) +COMPONENT_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMPONENT_NAME).$(UNOOXT_EXT)") COMPONENT_JAR_NAME = $(COMPONENT_NAME).uno.jar COMPONENT_JAR = $(OUT_CLASS)/$(COMPONENT_JAR_NAME) COMPONENT_MANIFESTFILE = $(OUT_COMP_CLASS)/$(COMPONENT_NAME).uno.Manifest @@ -110,7 +110,7 @@ $(COMPONENT_PACKAGE) : $(COMPONENT_JAR) $(COMPONENT_UNOPKG_MANIFEST) -$(DEL) $(subst \\,\,$(subst /,$(PS),$@)) -$(MKDIR) $(subst /,$(PS),$(@D)) cd $(subst /,$(PS),$(OUT_CLASS)) && $(SDK_ZIP) ../bin/$(@F) $(<F) - cd $(subst /,$(PS),$(OUT_COMP_CLASS)/$(subst .$(UNOPKG_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml + cd $(subst /,$(PS),$(OUT_COMP_CLASS)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml $(REGISTERFLAG) : $(COMPONENT_PACKAGE) ifneq "$(SDK_AUTO_DEPLOYMENT)" "" diff --git a/odk/examples/DevelopersGuide/Charts/Makefile b/odk/examples/DevelopersGuide/Charts/Makefile index c10aba4687c5..fb0255f13775 100644 --- a/odk/examples/DevelopersGuide/Charts/Makefile +++ b/odk/examples/DevelopersGuide/Charts/Makefile @@ -2,9 +2,9 @@ # # $RCSfile: Makefile,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2005-03-29 12:08:17 $ +# last change: $Author: obo $ $Date: 2007-01-25 11:03:17 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -64,8 +64,8 @@ APP5_NAME=SelectionChangeListener APP5_JAR=$(SAMPLE_CLASS_OUT)/$(APP5_NAME).jar COMPONENT_NAME=JavaSampleChartAddIn -COMPONENT_PACKAGE = $(OUT_BIN)/$(COMPONENT_NAME).$(UNOPKG_EXT) -COMPONENT_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMPONENT_NAME).$(UNOPKG_EXT)") +COMPONENT_PACKAGE = $(OUT_BIN)/$(COMPONENT_NAME).$(UNOOXT_EXT) +COMPONENT_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMPONENT_NAME).$(UNOOXT_EXT)") COMPONENT_JAR_NAME = $(COMPONENT_NAME).uno.jar COMPONENT_JAR = $(SAMPLE_CLASS_OUT)/$(COMPONENT_JAR_NAME) COMPONENT_MANIFESTFILE = $(SAMPLE_CLASS_OUT)/$(COMPONENT_NAME).uno.Manifest @@ -147,7 +147,7 @@ $(COMPONENT_PACKAGE) : $(COMPONENT_JAR) $(COMPONENT_UNOPKG_MANIFEST) -$(DEL) $(subst \\,\,$(subst /,$(PS),$@)) -$(MKDIR) $(subst /,$(PS),$(@D)) cd $(subst /,$(PS),$(SAMPLE_CLASS_OUT)) && $(SDK_ZIP) ../../bin/$(@F) $(<F) - cd $(subst /,$(PS),$(SAMPLE_CLASS_OUT)/$(subst .$(UNOPKG_EXT),,$(@F))) && $(SDK_ZIP) ../../../bin/$(@F) -u META-INF/manifest.xml + cd $(subst /,$(PS),$(SAMPLE_CLASS_OUT)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) ../../../bin/$(@F) -u META-INF/manifest.xml $(COMP_REGISTERFLAG) : $(COMPONENT_PACKAGE) ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES" |