[mapguide-commits] r7247 - in sandbox/jng/swig-java: . Web/src Web/src/JavaApiEx

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-12-08 04:11:49 -0800 (Sat, 08 Dec 2012)
New Revision: 7247

Modified:
   sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am
   sandbox/jng/swig-java/Web/src/Makefile.am
   sandbox/jng/swig-java/configure.in
Log:
#9: Linux build fixes for enhanced wrapper

Modified: sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am	2012-12-07 16:47:01 UTC (rev 7246)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am	2012-12-08 12:11:49 UTC (rev 7247)
@@ -461,7 +461,7 @@
 	../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
 	cp -f java.i language.i
 	../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
-	../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+	../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
 	rm -f org/osgeo/mapguide/*.class
 	mv -f *.java org/osgeo/mapguide
 	$(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java

Modified: sandbox/jng/swig-java/Web/src/Makefile.am
===================================================================
--- sandbox/jng/swig-java/Web/src/Makefile.am	2012-12-07 16:47:01 UTC (rev 7246)
+++ sandbox/jng/swig-java/Web/src/Makefile.am	2012-12-08 12:11:49 UTC (rev 7247)
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = WebApp WebSupport HttpHandler CgiAgent PhpApi JavaApi ApacheAgent
-DIST_SUBDIRS = WebApp WebSupport HttpHandler CgiAgent PhpApi JavaApi ApacheAgent
+SUBDIRS = WebApp WebSupport HttpHandler CgiAgent PhpApi JavaApi JavaApiEx ApacheAgent
+DIST_SUBDIRS = WebApp WebSupport HttpHandler CgiAgent PhpApi JavaApi JavaApiEx ApacheAgent
 EXTRA_DIST = MapGuideApi DotNetApi DotNetUnmanagedApi mapviewernet mapviewerjava mapviewerphp mapadmin mapagent stdicons viewerfiles WebTier.sln webconfig.ini WEB-INF localized schemareport webstudio PostBuild
 
 prefix=@prefix@/webserverextensions/www

Modified: sandbox/jng/swig-java/configure.in
===================================================================
--- sandbox/jng/swig-java/configure.in	2012-12-07 16:47:01 UTC (rev 7246)
+++ sandbox/jng/swig-java/configure.in	2012-12-08 12:11:49 UTC (rev 7247)
@@ -240,6 +240,7 @@
         Web/src/WebApp/Makefile \
         Web/src/WebSupport/Makefile \
         Web/src/JavaApi/Makefile \
+        Web/src/JavaApiEx/Makefile \
         Web/src/PhpApi/Makefile \
         Web/src/HttpHandler/Makefile \
         Web/src/CgiAgent/Makefile \