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
This commit is contained in:
Ivo Hinkelmann
2009-04-22 12:39:28 +00:00
parent 76931f7a47
commit 6df63a0fa7
12 changed files with 30 additions and 24 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -103,7 +103,8 @@ include $(SETTINGS)/stdtarget.mk
$(OUT_COMP_CLASS)/%.Manifest : $(OUT_COMP_CLASS)/%.Manifest :
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))
@echo RegistrationClassName: TestServiceProvider> $@ @echo UNO-Type-Path: $(basename $(notdir $*)).uno.jar> $@
@echo RegistrationClassName: TestServiceProvider>> $@
$(OUT_COMP_GEN)/%.urd : %.idl $(OUT_COMP_GEN)/%.urd : %.idl
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))

View File

@@ -99,7 +99,8 @@ include $(SETTINGS)/stdtarget.mk
$(COMP_GEN_OUT)/%.Manifest : $(COMP_GEN_OUT)/%.Manifest :
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))
@echo RegistrationClassName: $(basename $*)> $@ @echo UNO-Type-Path: $(basename $(notdir $*)).uno.jar> $@
@echo RegistrationClassName: $(basename $*)>> $@
$(SAMPLE_GEN_OUT)/%.urd : %.idl $(SAMPLE_GEN_OUT)/%.urd : %.idl
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))

View File

@@ -65,7 +65,8 @@ include $(SETTINGS)/stdtarget.mk
$(OUT_COMP_CLASS)/%.Manifest : $(OUT_COMP_CLASS)/%.Manifest :
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(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 $(OUT_COMP_CLASS)/$(PACKAGE)/%.class : %.java
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))

View File

@@ -100,7 +100,8 @@ include $(SETTINGS)/stdtarget.mk
$(COMP_GEN_OUT)/%.Manifest : $(COMP_GEN_OUT)/%.Manifest :
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))
@echo RegistrationClassName: $(basename $*)> $@ @echo UNO-Type-Path: $(basename $(notdir $*)).uno.jar> $@
@echo RegistrationClassName: $(basename $*)>> $@
$(SAMPLE_GEN_OUT)/%.urd : %.idl $(SAMPLE_GEN_OUT)/%.urd : %.idl
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))

View File

@@ -96,11 +96,8 @@ COMMON_JAVAFILES = \
COMMON_CLASSFILES = $(patsubst %.java,$(COMMON_CLASS_OUT)/%.class,$(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\ SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLASSPATH)\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\ $(PATH_SEPARATOR)$(SAMPLE_CLASS_OUT)\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/sandbox.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\
$(PATH_SEPARATOR)$(COMMON_CLASS_OUT)) $(PATH_SEPARATOR)$(COMMON_CLASS_OUT))
@@ -113,7 +110,7 @@ include $(SETTINGS)/stdtarget.mk
$(COMMON_CLASSFILES) : $(COMMON_JAVAFILES) $(COMMON_CLASSFILES) : $(COMMON_JAVAFILES)
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(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 # rule for client/example application manifest file
$(SAMPLE_GEN_OUT)/%.mf : $(SAMPLE_GEN_OUT)/%.mf :
@@ -125,19 +122,19 @@ $(SAMPLE_GEN_OUT)/%.mf :
$(APP1_CLASS_OUT)/$(APP1_NAME).class : $(APP1_NAME).java $(COMMON_CLASSFILES) $(APP1_CLASS_OUT)/$(APP1_NAME).class : $(APP1_NAME).java $(COMMON_CLASSFILES)
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(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) $(APP2_CLASS_OUT)/$(APP2_NAME).class : $(APP2_NAME).java $(COMMON_CLASSFILES)
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(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) $(APP3_CLASS_OUT)/$(APP3_NAME).class : $(APP3_NAME).java $(COMMON_CLASSFILES)
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(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) $(APP4_CLASS_OUT)/$(APP4_NAME).class : $(APP4_NAME).java $(COMMON_CLASSFILES)
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(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) $(APP1_JAR) : $(SAMPLE_GEN_OUT)/$(APP1_NAME).mf $(APP1_CLASS_OUT)/$(APP1_NAME).class $(COMMON_CLASSFILES)
-$(DEL) $(subst \\,\,$(subst /,$(PS),$@)) -$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
@@ -194,7 +191,7 @@ FormsExample : $(APP1_JAR) $(APP2_JAR) $(APP3_JAR) $(APP4_JAR)
ProgrammaticScriptAssignment.odt.load : $(COMP_REGISTERFLAG) ProgrammaticScriptAssignment.odt.load : $(COMP_REGISTERFLAG)
"$(OFFICE_PROGRAM_PATH)$(PS)soffice" $(basename $@) "$(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 $(SDK_JAVA) -Dcom.sun.star.lib.loader.unopath="$(OFFICE_PROGRAM_PATH)" -jar $< -d OO_SDK_Demo_DB -t bugs
%.run: $(SAMPLE_CLASS_OUT)/%.jar %.run: $(SAMPLE_CLASS_OUT)/%.jar

View File

@@ -140,7 +140,8 @@ include $(SETTINGS)/stdtarget.mk
$(SAMPLE_GEN_OUT)/%.Manifest : $(SAMPLE_GEN_OUT)/%.Manifest :
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(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 # IDLs only for component 1 relevant
$(COMP1_GEN_OUT)/%.urd : %.idl $(COMP1_GEN_OUT)/%.urd : %.idl

View File

@@ -296,17 +296,18 @@
<td class="cell80">Description</td> <td class="cell80">Description</td>
</tr> </tr>
<tr> <tr>
<td class="cell20"><a href="java/Inspector/"title="link to the source directory of the Java Inspector example">Inspector</a></td> <td class="cell20"><a href="http://wiki.services.openoffice.org/wiki/Object_Inspector" title="link to the Object Inspector project page in the wiki">Object Inspector</a></td>
<td class="cell80">The Instance Inspector is primarily an auxiliary tool <td class="cell80">The Object Inspector is primarily an auxiliary tool
for the developer, which can present information about an object of the for the developer, which can present information about an object of the
[PRODUCTNAME] API at run-time. Depending on the object to be inspected, [PRODUCTNAME] API at run-time. Depending on the object to be inspected,
appropriate methods, interfaces, services, and attributes can be displayed 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 represented in a predictable tree. If the attributes contained in an
object are to be examined, the appropriate nodes in the tree can be 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 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 categories are offered to the user, as long as those are available with
that object.</td> that object. The Object Inspector is currently available as a NetBeans project
only because of major code changes. Please see the <a href="http://wiki.services.openoffice.org/wiki/Object_Inspector" title="link to the Object Inspector project page in the wiki">project page</a> for further details.</td>
</tr> </tr>
<tr> <tr>
<td class="cell20"><a href="java/MinimalComponent/" title="link to the source directory of the Java MinimalComponent example">MinimalComponent</a></td> <td class="cell20"><a href="java/MinimalComponent/" title="link to the source directory of the Java MinimalComponent example">MinimalComponent</a></td>

View File

@@ -104,7 +104,8 @@ include $(SETTINGS)/stdtarget.mk
$(COMP_GEN_OUT)/%.Manifest : $(COMP_GEN_OUT)/%.Manifest :
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))
@echo RegistrationClassName: $(basename $*)> $@ @echo UNO-Type-Path: $(basename $*).uno.jar> $@
@echo RegistrationClassName: $(basename $*)>> $@
$(SAMPLE_GEN_OUT)/%.urd : %.idl $(SAMPLE_GEN_OUT)/%.urd : %.idl
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))

View File

@@ -104,7 +104,8 @@ include $(SETTINGS)/stdtarget.mk
# rule for a component manifest file # rule for a component manifest file
$(OUT_COMP_CLASS)/%.Manifest : $(OUT_COMP_CLASS)/%.Manifest :
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))
@echo RegistrationClassName: $(basename $*)> $@ @echo UNO-Type-Path: $(basename $*).uno.jar> $@
@echo RegistrationClassName: $(basename $*)>> $@
$(OUT_COMP_GEN)/%.urd : %.idl $(OUT_COMP_GEN)/%.urd : %.idl
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))

View File

@@ -93,7 +93,8 @@ include $(SETTINGS)/stdtarget.mk
$(COMP_CLASS_OUT)/%.Manifest : $(COMP_CLASS_OUT)/%.Manifest :
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(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 $(COMP_GEN_OUT)/%.urd : %.idl
-$(MKDIR) $(subst /,$(PS),$(@D)) -$(MKDIR) $(subst /,$(PS),$(@D))

View File

@@ -10,7 +10,7 @@ TARGET=odk
ZIP1TARGET=odkexamples ZIP1TARGET=odkexamples
ZIP1FLAGS=-u -r ZIP1FLAGS=-u -r
ZIP1DIR=$(PRJ) 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 .INCLUDE : target.mk