diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-17 08:52:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-17 08:52:30 +0000 |
| commit | 1eaad1c516d15c28296c90f6d324f2c6718ec6e5 (patch) | |
| tree | 9b8bc35d6676899fe86d99daf996346660cae942 /odk/examples/java/ToDo | |
| parent | 94d5ca03264df7ae531dcba30f7ab1462db8f542 (diff) | |
INTEGRATION: CWS sdk01 (1.9.4.1.6); FILE MERGED
2003/04/10 11:39:29 jsc 1.9.4.1.6.2: #108799# use new naming convention for uno components
2003/03/13 09:05:30 jsc 1.9.4.1.6.1: #108153# improve usability
Diffstat (limited to 'odk/examples/java/ToDo')
| -rw-r--r-- | odk/examples/java/ToDo/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/odk/examples/java/ToDo/Makefile b/odk/examples/java/ToDo/Makefile index 1c17a896..ae4fd7e5 100644 --- a/odk/examples/java/ToDo/Makefile +++ b/odk/examples/java/ToDo/Makefile @@ -11,13 +11,13 @@ include $(SETTINGS)/dk.mk COMPONENT1_NAME=ToDo OUT_COMP_CLASS=$(OUT_CLASS)/$(COMPONENT1_NAME) OUT_COMP_GEN=$(OUT_MISC)/$(COMPONENT1_NAME) -COMPONENT1_RDB_NAME=$(COMPONENT1_NAME).rdb +COMPONENT1_RDB_NAME=$(COMPONENT1_NAME).uno.rdb COMPONENT1_RDB=$(OUT_COMP_GEN)/$(COMPONENT1_RDB_NAME) -COMPONENT1_PACKAGE=$(OUT_BIN)/$(COMPONENT1_NAME).zip -COMPONENT1_PACKAGE_URL=$(subst \\,\,"$(COMPONENT_PACKAGE_DIR)$(PS)$(COMPONENT1_NAME).zip") -COMPONENT1_JAR_NAME=$(COMPONENT1_NAME).jar +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).Manifest +COMPONENT1_MANIFESTFILE=$(OUT_COMP_CLASS)/$(COMPONENT1_NAME).uno.Manifest REGISTERFLAG=$(OUT_MISC)$(PS)java_$(COMPONENT1_NAME)_register_component.flag @@ -59,7 +59,7 @@ $(OUT_COMP_GEN) : $(OUT) $(MKDIR) $(subst /,$(PS),$(OUT_COMP_CLASS)) $(OUT_COMP_CLASS)/%.Manifest : $(OUT_COMP_GEN) - @echo RegistrationClassName: $(basename $(@F))> $@ + @echo RegistrationClassName: $(basename $(basename $(@F)))> $@ $(OUT_COMP_GEN)/%.urd : %.idl $(OUT_COMP_GEN) idlc -C -I. -I$(IDL_DIR) -O$(OUT_COMP_GEN) $< @@ -75,7 +75,7 @@ $(CLASSFILES) : $(OUT_COMP_GEN) $(JAVAFILES) $(GENJAVAFILES) javac -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(GENJAVAFILES) $(JAVAFILES) $(OUT_CLASS)/%.jar : $(OUT_COMP_CLASS)/%.Manifest $(CLASSFILES) - cd $(OUT_COMP_CLASS) && jar cvfm ../$(@F) $(<F) $($(basename $(@F))_CLASSFILES) + cd $(OUT_COMP_CLASS) && jar cvfm ../$(@F) $(<F) $($(basename $(basename $(@F)))_CLASSFILES) $(OUT_BIN)/%.zip : $(OUT_COMP_GEN)/%.rdb $(OUT_CLASS)/%.jar $(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_CLASS)) @@ -98,7 +98,7 @@ endif JavaToDoExample : $(REGISTERFLAG) @echo -------------------------------------------------------------------------------- @echo The ToDo Java component was installed if SDK_AUTO_DEPLOYMENT = YES. - @echo Please load the ToDo.sxc document to see how this component works, see + @echo Please load the "$(QM)ToDo.sxc$(QM)" document to see how this component works, see @echo the example description. @echo -------------------------------------------------------------------------------- |