#i120634# Removed ConvwatchGUIProject.jar from source tree.

It is now created directly in the output tree.

testgraphical/prj/build.lst

 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

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

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=