From 6df63a0fa7539ff114a036f5acafb017614aa5bd Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 22 Apr 2009 12:39:28 +0000 Subject: CWS-TOOLING: integrate CWS sdk31fix_DEV300 2009-04-03 15:43:49 +0200 jsc r270492 : correct classpath 2009-04-02 16:27:49 +0200 jsc r270416 : fix typo in run target and classpath 2009-04-02 16:27:14 +0200 jsc r270415 : remove Inspector example, change docu to link into the wiki on the related project page 2009-04-01 14:07:33 +0200 jsc r270327 : #i100723# add Uno-Type-Path to jar manifest 2009-04-01 11:57:53 +0200 jsc r270315 : #i100723# add Uno-Type-Path to jar manifest 2009-04-01 11:47:59 +0200 jsc r270314 : #i100723# add Uno-Type-Path to jar manifest 2009-04-01 09:33:10 +0200 jsc r270304 : #i100723# add Uno-Type-Path to jar manifest 2009-04-01 09:30:39 +0200 jsc r270303 : #i100723# add Uno-Type-Path to jar manifest 2009-04-01 09:29:19 +0200 jsc r270301 : #i100712# change header image version number --- odk/docs/images/sdk_head-1.gif | Bin 10997 -> 10919 bytes .../Components/JavaComponent/Makefile | 3 ++- .../Components/SimpleLicense/Makefile | 3 ++- .../Thumbs/org/openoffice/comp/test/Makefile | 3 ++- .../Components/dialogcomponent/Makefile | 3 ++- odk/examples/DevelopersGuide/Forms/Makefile | 19 ++++++++----------- odk/examples/DevelopersGuide/Spreadsheet/Makefile | 3 ++- odk/examples/examples.html | 9 +++++---- odk/examples/java/MinimalComponent/Makefile | 3 ++- odk/examples/java/Spreadsheet/Makefile | 3 ++- odk/examples/java/ToDo/Makefile | 3 ++- odk/util/makefile.mk | 2 +- 12 files changed, 30 insertions(+), 24 deletions(-) (limited to 'odk') diff --git a/odk/docs/images/sdk_head-1.gif b/odk/docs/images/sdk_head-1.gif index c0170a600351..13c17cf9787d 100644 Binary files a/odk/docs/images/sdk_head-1.gif and b/odk/docs/images/sdk_head-1.gif differ diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile b/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile index 0df61c5801d7..bcda73051a48 100644 --- a/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile @@ -103,7 +103,8 @@ include $(SETTINGS)/stdtarget.mk $(OUT_COMP_CLASS)/%.Manifest : -$(MKDIR) $(subst /,$(PS),$(@D)) - @echo RegistrationClassName: TestServiceProvider> $@ + @echo UNO-Type-Path: $(basename $(notdir $*)).uno.jar> $@ + @echo RegistrationClassName: TestServiceProvider>> $@ $(OUT_COMP_GEN)/%.urd : %.idl -$(MKDIR) $(subst /,$(PS),$(@D)) diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile b/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile index 0e911982b35c..f8899bd5f5d3 100644 --- a/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile +++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile @@ -99,7 +99,8 @@ include $(SETTINGS)/stdtarget.mk $(COMP_GEN_OUT)/%.Manifest : -$(MKDIR) $(subst /,$(PS),$(@D)) - @echo RegistrationClassName: $(basename $*)> $@ + @echo UNO-Type-Path: $(basename $(notdir $*)).uno.jar> $@ + @echo RegistrationClassName: $(basename $*)>> $@ $(SAMPLE_GEN_OUT)/%.urd : %.idl -$(MKDIR) $(subst /,$(PS),$(@D)) diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile index 8d04911cb07e..6e44b55a3f9a 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile @@ -65,7 +65,8 @@ include $(SETTINGS)/stdtarget.mk $(OUT_COMP_CLASS)/%.Manifest : -$(MKDIR) $(subst /,$(PS),$(@D)) - @echo RegistrationClassName: $(subst /,.,$(PACKAGE)).$(basename $(basename $(@F)))> $@ + @echo UNO-Type-Path: $(basename $(notdir $*)).uno.jar> $@ + @echo RegistrationClassName: $(subst /,.,$(PACKAGE)).$(basename $(basename $(@F)))>> $@ $(OUT_COMP_CLASS)/$(PACKAGE)/%.class : %.java -$(MKDIR) $(subst /,$(PS),$(@D)) diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile b/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile index 7165faaa6c7d..454d5fefcd7f 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile @@ -100,7 +100,8 @@ include $(SETTINGS)/stdtarget.mk $(COMP_GEN_OUT)/%.Manifest : -$(MKDIR) $(subst /,$(PS),$(@D)) - @echo RegistrationClassName: $(basename $*)> $@ + @echo UNO-Type-Path: $(basename $(notdir $*)).uno.jar> $@ + @echo RegistrationClassName: $(basename $*)>> $@ $(SAMPLE_GEN_OUT)/%.urd : %.idl -$(MKDIR) $(subst /,$(PS),$(@D)) diff --git a/odk/examples/DevelopersGuide/Forms/Makefile b/odk/examples/DevelopersGuide/Forms/Makefile index d2af0e7c7981..b559e38f9487 100644 --- a/odk/examples/DevelopersGuide/Forms/Makefile +++ b/odk/examples/DevelopersGuide/Forms/Makefile @@ -96,11 +96,8 @@ COMMON_JAVAFILES = \ COMMON_CLASSFILES = $(patsubst %.java,$(COMMON_CLASS_OUT)/%.class,$(COMMON_JAVAFILES)) -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)$(SAMPLE_CLASS_OUT)\ $(PATH_SEPARATOR)$(COMMON_CLASS_OUT)) @@ -113,7 +110,7 @@ include $(SETTINGS)/stdtarget.mk $(COMMON_CLASSFILES) : $(COMMON_JAVAFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) - javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(COMMON_CLASS_OUT) $^ + $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(COMMON_CLASS_OUT) $^ # rule for client/example application manifest file $(SAMPLE_GEN_OUT)/%.mf : @@ -125,19 +122,19 @@ $(SAMPLE_GEN_OUT)/%.mf : $(APP1_CLASS_OUT)/$(APP1_NAME).class : $(APP1_NAME).java $(COMMON_CLASSFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) - javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(APP1_CLASS_OUT) $< + $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(APP1_CLASS_OUT) $< $(APP2_CLASS_OUT)/$(APP2_NAME).class : $(APP2_NAME).java $(COMMON_CLASSFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) - javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(APP2_CLASS_OUT) $< + $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(APP2_CLASS_OUT) $< $(APP3_CLASS_OUT)/$(APP3_NAME).class : $(APP3_NAME).java $(COMMON_CLASSFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) - javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(APP3_CLASS_OUT) $< + $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(APP3_CLASS_OUT) $< $(APP4_CLASS_OUT)/$(APP4_NAME).class : $(APP4_NAME).java $(COMMON_CLASSFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) - javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(APP4_CLASS_OUT) $< + $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(APP4_CLASS_OUT) $< $(APP1_JAR) : $(SAMPLE_GEN_OUT)/$(APP1_NAME).mf $(APP1_CLASS_OUT)/$(APP1_NAME).class $(COMMON_CLASSFILES) -$(DEL) $(subst \\,\,$(subst /,$(PS),$@)) @@ -194,7 +191,7 @@ FormsExample : $(APP1_JAR) $(APP2_JAR) $(APP3_JAR) $(APP4_JAR) ProgrammaticScriptAssignment.odt.load : $(COMP_REGISTERFLAG) "$(OFFICE_PROGRAM_PATH)$(PS)soffice" $(basename $@) -DataAwareness.run: $(SAMPLE_CALSS_OUT)/DataAwareness.jar +DataAwareness.run: $(SAMPLE_CLASS_OUT)/DataAwareness.jar $(SDK_JAVA) -Dcom.sun.star.lib.loader.unopath="$(OFFICE_PROGRAM_PATH)" -jar $< -d OO_SDK_Demo_DB -t bugs %.run: $(SAMPLE_CLASS_OUT)/%.jar diff --git a/odk/examples/DevelopersGuide/Spreadsheet/Makefile b/odk/examples/DevelopersGuide/Spreadsheet/Makefile index d7a6d8d94f42..e56d322f2d0c 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/Makefile +++ b/odk/examples/DevelopersGuide/Spreadsheet/Makefile @@ -140,7 +140,8 @@ include $(SETTINGS)/stdtarget.mk $(SAMPLE_GEN_OUT)/%.Manifest : -$(MKDIR) $(subst /,$(PS),$(@D)) - @echo RegistrationClassName: $(basename $(basename $(@F)))> $@ + @echo UNO-Type-Path: $(basename $(notdir $*)).uno.jar> $@ + @echo RegistrationClassName: $(basename $(basename $(@F)))>> $@ # IDLs only for component 1 relevant $(COMP1_GEN_OUT)/%.urd : %.idl diff --git a/odk/examples/examples.html b/odk/examples/examples.html index c0d73e8435d4..f3d0fb33f775 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -296,17 +296,18 @@ Description - Inspector - The Instance Inspector is primarily an auxiliary tool + Object Inspector + The Object Inspector is primarily an auxiliary tool for the developer, which can present information about an object of the [PRODUCTNAME] API at run-time. Depending on the object to be inspected, appropriate methods, interfaces, services, and attributes can be displayed - to the developer. The methods, interfaces, services and attributes are + to the developer. The methods, interfaces, services and attributes are represented in a predictable tree. If the attributes contained in an object are to be examined, the appropriate nodes in the tree can be expanded with the help of the mouse. For each non primitive object, five categories are offered to the user, as long as those are available with - that object. + that object. The Object Inspector is currently available as a NetBeans project + only because of major code changes. Please see the project page for further details. MinimalComponent diff --git a/odk/examples/java/MinimalComponent/Makefile b/odk/examples/java/MinimalComponent/Makefile index 5a9ec6bcac50..c23a83603f69 100644 --- a/odk/examples/java/MinimalComponent/Makefile +++ b/odk/examples/java/MinimalComponent/Makefile @@ -104,7 +104,8 @@ include $(SETTINGS)/stdtarget.mk $(COMP_GEN_OUT)/%.Manifest : -$(MKDIR) $(subst /,$(PS),$(@D)) - @echo RegistrationClassName: $(basename $*)> $@ + @echo UNO-Type-Path: $(basename $*).uno.jar> $@ + @echo RegistrationClassName: $(basename $*)>> $@ $(SAMPLE_GEN_OUT)/%.urd : %.idl -$(MKDIR) $(subst /,$(PS),$(@D)) diff --git a/odk/examples/java/Spreadsheet/Makefile b/odk/examples/java/Spreadsheet/Makefile index bbbf5b2b692f..200e80aabe4d 100644 --- a/odk/examples/java/Spreadsheet/Makefile +++ b/odk/examples/java/Spreadsheet/Makefile @@ -104,7 +104,8 @@ include $(SETTINGS)/stdtarget.mk # rule for a component manifest file $(OUT_COMP_CLASS)/%.Manifest : -$(MKDIR) $(subst /,$(PS),$(@D)) - @echo RegistrationClassName: $(basename $*)> $@ + @echo UNO-Type-Path: $(basename $*).uno.jar> $@ + @echo RegistrationClassName: $(basename $*)>> $@ $(OUT_COMP_GEN)/%.urd : %.idl -$(MKDIR) $(subst /,$(PS),$(@D)) diff --git a/odk/examples/java/ToDo/Makefile b/odk/examples/java/ToDo/Makefile index cc88756473e3..de7f0f01d09c 100644 --- a/odk/examples/java/ToDo/Makefile +++ b/odk/examples/java/ToDo/Makefile @@ -93,7 +93,8 @@ include $(SETTINGS)/stdtarget.mk $(COMP_CLASS_OUT)/%.Manifest : -$(MKDIR) $(subst /,$(PS),$(@D)) - @echo RegistrationClassName: $(basename $(basename $(@F)))> $@ + @echo UNO-Type-Path: $(basename $*).uno.jar> $@ + @echo RegistrationClassName: $(basename $(basename $(@F)))>> $@ $(COMP_GEN_OUT)/%.urd : %.idl -$(MKDIR) $(subst /,$(PS),$(@D)) diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk index f43f45e819ca..078ecb987157 100644 --- a/odk/util/makefile.mk +++ b/odk/util/makefile.mk @@ -10,7 +10,7 @@ TARGET=odk ZIP1TARGET=odkexamples ZIP1FLAGS=-u -r ZIP1DIR=$(PRJ) -ZIP1LIST=examples -x "*.svn*" -x "*CVS*" -x "*makefile.mk" -x "*Container1*" -x "*Storage*" -x "*register_component*" -x "*examples.html" +ZIP1LIST=examples -x "*.svn*" -x "*CVS*" -x "*makefile.mk" -x "*Inspector*" -x "*Container1*" -x "*Storage*" -x "*register_component*" -x "*examples.html" .INCLUDE : target.mk -- cgit