diff options
| -rw-r--r-- | testgraphical/prj/build.lst | 4 | ||||
| -rw-r--r-- | testgraphical/ui/java/ConvwatchGUIProject/dist/ConvwatchGUIProject.jar | bin | 28271 -> 0 bytes | |||
| -rw-r--r-- | testgraphical/ui/java/ConvwatchGUIProject/makefile.mk | 6 | ||||
| -rw-r--r-- | testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/testgraphical/prj/build.lst b/testgraphical/prj/build.lst index 75878a6d9dd8..8d617c0512af 100644 --- a/testgraphical/prj/build.lst +++ b/testgraphical/prj/build.lst @@ -1,7 +1,3 @@ gfxcmp testgraphical : instsetoo_native qadevOOo NULL gfxcmp testgraphical usr1 - all gfxcmp_mkout NULL -#gfxcmp testgraphical\prechecks nmake - all gfxcmp_pre NULL gfxcmp testgraphical\ui\java\ConvwatchGUIProject nmake - all gfxcmp_java_ui NULL -gfxcmp testgraphical\ui\java nmake - all gfxcmp_java gfxcmp_java_ui NULL -# gfxcmp testgraphical\source nmake - all gfxcmp_src gfxcmp_java NULL -#i112751 gfxcmp testgraphical\qa\graphical nmake - all gfxcmp_qa gfxcmp_java NULL diff --git a/testgraphical/ui/java/ConvwatchGUIProject/dist/ConvwatchGUIProject.jar b/testgraphical/ui/java/ConvwatchGUIProject/dist/ConvwatchGUIProject.jar Binary files differdeleted file mode 100644 index 3b0ac20afa74..000000000000 --- a/testgraphical/ui/java/ConvwatchGUIProject/dist/ConvwatchGUIProject.jar +++ /dev/null diff --git a/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk b/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk index 25ad2b44c2e7..086d187105a2 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk +++ b/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk @@ -44,16 +44,16 @@ nothing .PHONY: .ELSE -ALLTAR: dist/ConvwatchGUIProject.jar +ALLTAR: $(CLASSDIR)/ConvwatchGUIProject.jar -dist/ConvwatchGUIProject.jar: src/ConvwatchGUI.java src/IniFile.java +$(CLASSDIR)/ConvwatchGUIProject.jar: src/ConvwatchGUI.java src/IniFile.java # .if $(JDK_VERSION) < 160 # echo "You need at least java 6" # error # .endif # .IF "$(GUI)"=="WNT" - $(ANT) + $(ANT) -DJAR_OUTPUT_DIRECTORY=$(CLASSDIR) jar .ELSE ant .END diff --git a/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties b/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties index e93770088ad9..e3606fb68a8d 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties +++ b/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties @@ -40,7 +40,7 @@ debug.classpath=\ debug.test.classpath=\ ${run.test.classpath} # This directory is removed when the project is cleaned: -dist.dir=dist +dist.dir=${JAR_OUTPUT_DIRECTORY} dist.jar=${dist.dir}/ConvwatchGUIProject.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= |