INTEGRATION: CWS sdk01 (1.9.12.1.6); FILE MERGED

2003/04/10 11:38:21 jsc 1.9.12.1.6.1: #108799# use new naming convention for uno components

odk/examples/java/Inspector/Makefile

@@ -11,13 +11,13 @@ include $(SETTINGS)/dk.mk
 COMPONENT1_NAME=InstanceInspector
 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
 
@@ -64,7 +64,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) $<
@@ -80,7 +80,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))