summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-01-31 16:09:52 +0000
committerRüdiger Timm <rt@openoffice.org>2005-01-31 16:09:52 +0000
commit0f1e35dd3abadc5645073154fcdfcadc08ee3a22 (patch)
tree375bae320aada3e78cdb2dcefb4ad5692511f24f
parentf87ffabdda3ffa54971b3e278d6036974ddc7aa5 (diff)
INTEGRATION: CWS sdksample (1.5.4); FILE MERGED
2004/11/11 10:33:55 jsc 1.5.4.5: #i29308# adapted 2004/07/30 14:30:08 jsc 1.5.4.4: #i29308# use quotes for unopath option 2004/07/30 08:36:30 jsc 1.5.4.3: #i29308# adjust ECHOLINE for windows 2004/07/29 12:22:52 jsc 1.5.4.2: #i29308# insert ECHOLINE macro to dump an empty line in manifest files 2004/06/04 14:52:34 jsc 1.5.4.1: #i29308# use of new bootstrap feature
-rw-r--r--odk/examples/java/Drawing/Makefile45
1 files changed, 29 insertions, 16 deletions
diff --git a/odk/examples/java/Drawing/Makefile b/odk/examples/java/Drawing/Makefile
index 602abb784143..748348977ab3 100644
--- a/odk/examples/java/Drawing/Makefile
+++ b/odk/examples/java/Drawing/Makefile
@@ -2,9 +2,9 @@
#
# $RCSfile: Makefile,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: rt $ $Date: 2004-05-18 13:30:30 $
+# last change: $Author: rt $ $Date: 2005-01-31 17:09:52 $
#
# The Contents of this file are made available subject to the terms of
# the BSD license.
@@ -48,38 +48,51 @@ include $(SETTINGS)/std.mk
include $(SETTINGS)/dk.mk
# Define non-platform/compiler specific settings
-COMPONENT_NAME=JavaDrawingExample
-OUT_COMP_CLASS = $(OUT_CLASS)/$(COMPONENT_NAME)
+EXAMPLE_NAME=JavaDrawingExample
+OUT_APP_CLASS = $(OUT_CLASS)/$(EXAMPLE_NAME)
-JAVAFILES = \
- SDraw.java
-
-CLASSFILES = $(patsubst %.java,$(OUT_COMP_CLASS)/%.class,$(JAVAFILES))
+APP1_NAME=SDraw
+APP1_JAR=$(OUT_APP_CLASS)/$(APP1_NAME).jar
SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLASSPATH)\
- $(PATH_SEPARATOR)$(OUT_COMP_CLASS))
+ $(PATH_SEPARATOR)$(OUT_APP_CLASS))
# Targets
.PHONY: ALL
ALL : \
- JavaDrawingExample
+ $(EXAMPLE_NAME)
include $(SETTINGS)/stdtarget.mk
-$(CLASSFILES) : $(JAVAFILES)
+$(OUT_APP_CLASS)/%.class : %.java
+ -$(MKDIR) $(subst /,$(PS),$(@D))
+ $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_APP_CLASS) $<
+
+$(OUT_APP_CLASS)/%.mf :
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
-JavaDrawingExample : $(CLASSFILES)
+ @echo Main-Class: com.sun.star.lib.loader.Loader> $@
+ $(ECHOLINE)>> $@
+ @echo Name: com/sun/star/lib/loader/Loader.class>> $@
+ @echo Application-Class: $*>> $@
+
+$(OUT_APP_CLASS)/%.jar : $(OUT_APP_CLASS)/%.mf $(OUT_APP_CLASS)/%.class
+ -$(MKDIR) $(subst /,$(PS),$(@D))
+ +cd $(subst /,$(PS),$(OUT_APP_CLASS)) && $(SDK_JAR) cvfm $(@F) $*.mf $*.class
+ +$(SDK_JAR) uvf $@ $(SDK_JAVA_UNO_BOOTSTRAP_FILES)
+
+$(APP1_JAR) : $(OUT_APP_CLASS)/$(APP1_NAME).mf $(OUT_APP_CLASS)/$(APP1_NAME).class
+
+$(EXAMPLE_NAME) : $(APP1_JAR)
@echo --------------------------------------------------------------------------------
@echo Please use the following command to execute the example!
@echo -
@echo make SDraw.run
@echo --------------------------------------------------------------------------------
-%.run: $(OUT_COMP_CLASS)/%.class
- $(SDK_JAVA) -classpath "$(SDK_CLASSPATH)" $(basename $@)
+%.run: $(OUT_APP_CLASS)/%.jar
+ $(SDK_JAVA) -Dcom.sun.star.lib.loader.unopath="$(OFFICE_PROGRAM_PATH)" -jar $<
.PHONY: clean
clean :
- -$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_CLASS))
+ -$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_CLASS))