You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2012/08/21 15:57:29 UTC
svn commit: r1375548 - in /incubator/ooo/trunk/main/testgraphical:
prj/build.lst ui/java/ConvwatchGUIProject/dist/
ui/java/ConvwatchGUIProject/makefile.mk
ui/java/ConvwatchGUIProject/nbproject/project.properties
Author: af
Date: Tue Aug 21 13:57:29 2012
New Revision: 1375548
URL: http://svn.apache.org/viewvc?rev=1375548&view=rev
Log:
#i120634# Removed ConvwatchGUIProject.jar from source tree.
It is now created directly in the output tree.
Removed:
incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/dist/
Modified:
incubator/ooo/trunk/main/testgraphical/prj/build.lst
incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk
incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties
Modified: incubator/ooo/trunk/main/testgraphical/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testgraphical/prj/build.lst?rev=1375548&r1=1375547&r2=1375548&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testgraphical/prj/build.lst (original)
+++ incubator/ooo/trunk/main/testgraphical/prj/build.lst Tue Aug 21 13:57:29 2012
@@ -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
Modified: incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk?rev=1375548&r1=1375547&r2=1375548&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk (original)
+++ incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk Tue Aug 21 13:57:29 2012
@@ -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
Modified: incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties?rev=1375548&r1=1375547&r2=1375548&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties (original)
+++ incubator/ooo/trunk/main/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties Tue Aug 21 13:57:29 2012
@@ -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=