[mapserver-commits] r7228 - trunk/mapserver/mapscript/java

[svn at osgeo.org]

Author: tamas
Date: 2007-12-29 20:05:38 -0500 (Sat, 29 Dec 2007)
New Revision: 7228

Modified:
   trunk/mapserver/mapscript/java/makefile.vc
Log:
Fix for the win32 build problems

Modified: trunk/mapserver/mapscript/java/makefile.vc
===================================================================
--- trunk/mapserver/mapscript/java/makefile.vc	2007-12-29 19:01:45 UTC (rev 7227)
+++ trunk/mapserver/mapscript/java/makefile.vc	2007-12-30 01:05:38 UTC (rev 7228)
@@ -30,9 +30,10 @@
 all: interface_release mapscript_java mapscript_lib mapscript_jar
 
 interface_release: 
-        -mkdir edu\umn\gis\mapscript
+        -md edu\umn\gis\mapscript
         $(SWIG) -java -package edu.umn.gis.mapscript -outdir edu/umn/gis/mapscript -o mapscript_wrap.c ../mapscript.i
 
+
 mapscript_java:
 	$(JAVAC) edu\umn\gis\mapscript\*.java
 
@@ -46,6 +47,7 @@
         link /dll /debug \
 		mapscript_wrap.obj $(EXTERNAL_LIBS) ..\..\mapserver_i.lib $(LDFLAGS) /def:..\..\mapserver.def \
                 /out:$(MS_DLL) /implib:$(MS_LIB_DLL)
+	if exist $(MS_DLL).manifest mt -manifest $(MS_DLL).manifest -outputresource:$(MS_DLL);2
 
 mapscript_javadoc:
 	$(JAVADOC) -d doc -sourcepath edu/umn/gis/mapscript/*.java
@@ -53,15 +55,20 @@
 mapscript_jar:
 	$(JAR) cf mapscript.jar edu
 test:
-	$(JAVAC) -classpath d:\cvs\mapserver\mapscript\java\mapscript.jar -d examples\ examples\*.java
+	$(JAVAC) -classpath ./mapscript.jar -d examples\ examples\*.java
 	$(JAVA)  -cp ./;examples/;./mapscript.jar -Djava.library.path=. DumpShp ../../tests/point.shp
 	$(JAVA)  -cp ./;examples/;./mapscript.jar -Djava.library.path=. ShapeInfo ..\..\tests\point.shp ..\..\tests\point.dbf
 	$(JAVA)  -cp ./;examples/;./mapscript.jar -Djava.library.path=. DrawMap ..\..\tests\test.map .\map.png
+	$(JAVA)  -cp ./;examples/;./mapscript.jar -Djava.library.path=. RFC24 ..\..\tests\test.map .\map.png
 
 clean:
 	-del *.obj
 	-del *.lib
 	-rmdir /s /q edu
-	del libmapscript.dll
+	del $(MS_DLL)
+	del $(MS_DLL).manifest
 	del mapscript_wrap.c
-
+	del mapscript.jar
+	del *.ilk
+	del *.pdb
+	del *.exp