diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-05-18 12:31:39 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-18 12:31:39 +0000 |
commit | 23e4836fbce277672b5e53dba85f66a05cc1637e (patch) | |
tree | 26ac4be2a239043faf92006feabe0e9541da450f /odk/examples/java/PropertySet | |
parent | 93e80570256b5d8df59e3c96005a7ae5564862f2 (diff) |
INTEGRATION: CWS sdk13 (1.11.94); FILE MERGED
2004/05/05 09:31:45 jsc 1.11.94.1: #116658# merge cinnabar changes
Diffstat (limited to 'odk/examples/java/PropertySet')
-rw-r--r-- | odk/examples/java/PropertySet/Makefile | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/odk/examples/java/PropertySet/Makefile b/odk/examples/java/PropertySet/Makefile index 121ae53fb134..0b731e767172 100644 --- a/odk/examples/java/PropertySet/Makefile +++ b/odk/examples/java/PropertySet/Makefile @@ -2,9 +2,9 @@ # # $RCSfile: Makefile,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: vg $ $Date: 2003-07-09 10:41:34 $ +# last change: $Author: rt $ $Date: 2004-05-18 13:31:39 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -48,28 +48,24 @@ include $(SETTINGS)/std.mk include $(SETTINGS)/dk.mk # Define non-platform/compiler specific settings -COMPONENT1_NAME=PropTest -OUT_COMP_CLASS=$(OUT_CLASS)/$(COMPONENT1_NAME) -OUT_COMP_GEN=$(OUT_MISC)/$(COMPONENT1_NAME) -COMPONENT1_PACKAGE=$(OUT_BIN)/$(COMPONENT1_NAME).uno.zip -COMPONENT1_PACKAGE_URL=$(subst \\,\,"$(COMPONENT_PACKAGE_DIR)$(PS)$(COMPONENT1_NAME).uno.zip") -COMPONENT1_JAR_NAME=$(COMPONENT1_NAME).uno.jar -COMPONENT1_JAR=$(OUT_CLASS)/$(COMPONENT1_JAR_NAME) -COMPONENT1_MANIFESTFILE=$(OUT_COMP_CLASS)/$(COMPONENT1_NAME).uno.Manifest +COMPONENT_NAME=PropTest +OUT_COMP_CLASS=$(OUT_CLASS)/$(COMPONENT_NAME) +OUT_COMP_GEN=$(OUT_MISC)/$(COMPONENT_NAME) +COMPONENT_PACKAGE=$(OUT_BIN)/$(COMPONENT_NAME).uno.zip +COMPONENT_PACKAGE_URL=$(subst \\,\,"$(COMPONENT_PACKAGE_DIR)$(PS)$(COMPONENT_NAME).uno.zip") +COMPONENT_JAR_NAME=$(COMPONENT_NAME).uno.jar +COMPONENT_JAR=$(OUT_CLASS)/$(COMPONENT_JAR_NAME) +COMPONENT_MANIFESTFILE=$(OUT_COMP_CLASS)/$(COMPONENT_NAME).uno.Manifest -REGISTERFLAG=$(OUT_MISC)$(PS)java_$(COMPONENT1_NAME)_register_component.flag +REGISTERFLAG=$(OUT_MISC)$(PS)java_$(COMPONENT_NAME)_register_component.flag JAVAFILES = PropTest.java CLASSFILES = $(patsubst %.java,$(OUT_COMP_CLASS)/%.class,$(JAVAFILES)) -$(COMPONENT1_NAME)_CLASSFILES = $(COMPONENT1_NAME).class +$(COMPONENT_NAME)_CLASSFILES = $(COMPONENT_NAME).class -SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\ - $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\ - $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\ - $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/sandbox.jar\ - $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\ +SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLASSPATH)\ $(PATH_SEPARATOR)$(OUT_COMP_CLASS)) @@ -85,21 +81,21 @@ $(OUT_COMP_CLASS)/%.Manifest : $(CLASSFILES) : $(JAVAFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) - javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) + $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) -$(OUT_CLASS)/%.jar : $(OUT_COMP_CLASS)/%.Manifest $(CLASSFILES) +$(COMPONENT_JAR) : $(COMPONENT_MANIFESTFILE) $(CLASSFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) - cd $(subst /,$(PS),$(OUT_COMP_CLASS)) && jar cvfm ../$(@F) $(<F) $($(basename $(basename $(@F)))_CLASSFILES) + cd $(subst /,$(PS),$(OUT_COMP_CLASS)) && $(SDK_JAR) cvfm ../$(@F) $(<F) $($(basename $(basename $(@F)))_CLASSFILES) -$(OUT_BIN)/%.zip : $(OUT_CLASS)/%.jar +$(COMPONENT_PACKAGE) : $(COMPONENT_JAR) -$(MKDIR) $(subst /,$(PS),$(@D)) - cd $(subst /,$(PS),$(OUT_CLASS)) && jar cvfM ../bin/$(@F) $(^F) + cd $(subst /,$(PS),$(OUT_CLASS)) && $(SDK_JAR) cvfM ../bin/$(@F) $(^F) -$(REGISTERFLAG) : $(COMPONENT1_PACKAGE) -ifneq "$(SDK_AUTO_DEPLOYMENT)" "" +$(REGISTERFLAG) : $(COMPONENT_PACKAGE) +ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES" -$(MKDIR) $(subst /,$(PS),$(@D)) -$(DEL) $(subst /,$(PS),$@) - $(DEPLOYTOOL) $(COMPONENT1_PACKAGE_URL) + $(DEPLOYTOOL) $(COMPONENT_PACKAGE_URL) @echo flagged > $(subst /,$(PS),$@) else @echo -------------------------------------------------------------------------------- @@ -120,6 +116,6 @@ JavaPropertySetExample : $(REGISTERFLAG) clean : -$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_CLASS)) -$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_GEN)) - -$(DEL) $(subst /,$(PS),$(COMPONENT1_PACKAGE_URL)) - -$(DEL) $(subst /,$(PS),$(COMPONENT1_JAR)) - -$(DEL) $(subst /,$(PS),$(REGISTERFLAG)) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMPONENT_PACKAGE_URL))) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMPONENT_JAR))) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$(REGISTERFLAG))) |