diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:57:43 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:57:43 +0000 |
| commit | 5d48c84e60bf5f503a9d4a78703dfb6045391f9f (patch) | |
| tree | af97b16fe22a9a28ffd26445082d400fb30aad34 /embeddedobj/test | |
| parent | 40f032525ceec6ed28b47a5fe042fb6059af8d4d (diff) | |
INTEGRATION: CWS mav09 (1.4.2); FILE MERGED
2004/08/09 18:53:57 mav 1.4.2.4: RESYNC: (1.4-1.5); FILE MERGED
2004/02/19 10:31:38 mav 1.4.2.3: #115011# embedded object representation
2004/01/28 08:58:10 mav 1.4.2.2: #115011# bitmap painting
2004/01/27 15:54:50 mav 1.4.2.1: #115011# VCL window for container
Diffstat (limited to 'embeddedobj/test')
| -rw-r--r-- | embeddedobj/test/Container1/makefile.mk | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk index b20b3447d4bb..d606742fe6fb 100644 --- a/embeddedobj/test/Container1/makefile.mk +++ b/embeddedobj/test/Container1/makefile.mk @@ -1,11 +1,10 @@ - #************************************************************************* # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Date: 2004-07-23 15:14:46 $ +# last change: $Date: 2004-10-04 19:57:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,6 +68,10 @@ PACKAGE = embeddedobj$/test # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +# EXEC_CLASSPATH_TMP = \ +# $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR) +# EXEC_CLASSPATH = \ +# $(strip $(subst,!,$(PATH_SEPERATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) #----- compile .java files ----------------------------------------- @@ -76,15 +79,21 @@ JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar JAVAFILES = \ EmbedContApp.java\ - EmbedContFrame.java + EmbedContFrame.java\ + NativeView.java\ + WindowHelper.java\ + JavaWindowPeerFake.java\ + BitmapPainter.java\ + PaintThread.java CLASSFILES = $(patsubst %.java,$(OUT_COMP_CLASS)/%.class,$(JAVAFILES)) + # --- Targets ------------------------------------------------------ .INCLUDE: target.mk -ALL : \ +ALL : $(OUT)$/slo$/nativeview.obj JavaStorageTestExample JavaStorageTestExample : $(CLASSFILES) @@ -94,11 +103,19 @@ JavaStorageTestExample : $(CLASSFILES) @echo "dmake run" @echo -------------------------------------------------------------------------------- +# $(OUT)$/slo$/nativeview.obj: + # cd nativelib; dmake debug=t; cd .. + +# echo $(SOLARBINDIR) +# echo $(EXEC_CLASSPATH) + run: $(CLASSFILES) - java -classpath "$(CLASSPATH)" EmbedContFrame + +set PATH=$(PATH)$(PATH_SEPERATOR)$(JDK14PATH)$/jre$/bin && \ + java -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(JDK14PATH)$/jre$/bin;$(JDK14PATH)$/jre$/lib;$(CLASSPATH)" embeddedobj.test.EmbedContFrame debug: $(CLASSFILES) - jdb -classpath "$(CLASSPATH)" EmbedContFrame + +set PATH=$(PATH)$(PATH_SEPERATOR)$(JDK14PATH)$/jre$/bin && \ + jdb -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(CLASSPATH)" embeddedobj.test.EmbedContFrame clean : -$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_CLASS)) |