[mapguide-commits] r6773 - trunk/Installer/scripts

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-06-16 04:14:42 -0700 (Sat, 16 Jun 2012)
New Revision: 6773

Modified:
   trunk/Installer/scripts/build.sh
   trunk/Installer/scripts/mginstallubuntu.sh
Log:
commandline svn caught me off guard

Modified: trunk/Installer/scripts/build.sh
===================================================================
--- trunk/Installer/scripts/build.sh	2012-06-16 11:10:19 UTC (rev 6772)
+++ trunk/Installer/scripts/build.sh	2012-06-16 11:14:42 UTC (rev 6773)
@@ -17,7 +17,7 @@
 #SVNROOT="http://svn.osgeo.org"
 SVNRELPATH=/mapguide/branches/2.4/MgDev
 MY_MAKE_OPTS="-j 4"
-UBUNTU=0
+UBUNTU=1
 PRESERVE_BUILD_ROOT=1
 
 echo "******************************************************************"
@@ -122,8 +122,7 @@
 libtoolize --force
 automake --add-missing --copy
 autoconf
-#./configure --enable-optimized --prefix=${INSTALLROOT}
-./configure --prefix=${INSTALLROOT}
+./configure --enable-optimized --prefix=${INSTALLROOT}
 make $MY_MAKE_OPTS
 check_build
 BUILD_COMPONENT="MapGuide Install"

Modified: trunk/Installer/scripts/mginstallubuntu.sh
===================================================================
--- trunk/Installer/scripts/mginstallubuntu.sh	2012-06-16 11:10:19 UTC (rev 6772)
+++ trunk/Installer/scripts/mginstallubuntu.sh	2012-06-16 11:14:42 UTC (rev 6773)
@@ -1,13 +1,13 @@
 #!/bin/bash
 TEMPDIR=/tmp/build_mapguide
-#URL="http://download.osgeo.org/mapguide/releases/2.4.0/B/ubuntu11"
-URL="http://192.168.0.2/downloads/ubuntu11"
+#URL="http://download.osgeo.org/mapguide/releases/2.4.0/Beta1/ubuntu12"
+URL="http://192.168.0.2/downloads/ubuntu12"
 FDOVER_MAJOR_MINOR=3.7
 FDOVER_MAJOR_MINOR_REV=${FDOVER_MAJOR_MINOR}.0
-FDOVER=${FDOVER_MAJOR_MINOR_REV}-4308_i386
+FDOVER=${FDOVER_MAJOR_MINOR_REV}-6479_i386
 MGVER_MAJOR_MINOR=2.4
 MGVER_MAJOR_MINOR_REV=${MGVER_MAJOR_MINOR}.0
-MGVER=${MGVER_MAJOR_MINOR_REV}-6579_i386
+MGVER=${MGVER_MAJOR_MINOR_REV}-6757_i386
 
 # Must have root
 if [[ $EUID -ne 0 ]]; then
@@ -160,7 +160,7 @@
 			echo -ne "\n    <LibraryPath>libKingOracleProvider.so</LibraryPath>" >> ${providersxml}
 			echo -ne "\n  </FeatureProvider>" >> ${providersxml}
 			;;
-		  odbc)
+		  rdbms)
 			echo "Registering ODBC Provider"
 			echo -ne "\n  <FeatureProvider>" >> ${providersxml}
 			echo -ne "\n    <Name>OSGeo.ODBC.${FDOVER_MAJOR_MINOR}</Name>" >> ${providersxml}
@@ -171,20 +171,6 @@
 			echo -ne "\n    <FeatureDataObjectsVersion>${FDOVER_MAJOR_MINOR_REV}.0</FeatureDataObjectsVersion>" >> ${providersxml}
 			echo -ne "\n    <LibraryPath>libFdoODBC.so</LibraryPath>" >> ${providersxml}
 			echo -ne "\n  </FeatureProvider>" >> ${providersxml}
-			;;
-		  ogr)
-			echo "Registering OGR Provider"
-			echo -ne "\n  <FeatureProvider>" >> ${providersxml}
-			echo -ne "\n    <Name>OSGeo.OGR.${FDOVER_MAJOR_MINOR}</Name>" >> ${providersxml}
-			echo -ne "\n    <DisplayName>OSGeo FDO Provider for OGR</DisplayName>" >> ${providersxml}
-			echo -ne "\n    <Description>FDO Access to OGR Data Sources</Description>" >> ${providersxml}
-			echo -ne "\n    <IsManaged>False</IsManaged>" >> ${providersxml}
-			echo -ne "\n    <Version>${FDOVER_MAJOR_MINOR_REV}.0</Version>" >> ${providersxml}
-			echo -ne "\n    <FeatureDataObjectsVersion>${FDOVER_MAJOR_MINOR_REV}.0</FeatureDataObjectsVersion>" >> ${providersxml}
-			echo -ne "\n    <LibraryPath>libOGRProvider.so</LibraryPath>" >> ${providersxml}
-			echo -ne "\n  </FeatureProvider>" >> ${providersxml}
-			;;
-		  postgis)
 			echo "Registering PostgreSQL Provider"
 			echo -ne "\n  <FeatureProvider>" >> ${providersxml}
 			echo -ne "\n    <Name>OSGeo.PostgreSQL.${FDOVER_MAJOR_MINOR}</Name>" >> ${providersxml}
@@ -195,8 +181,6 @@
 			echo -ne "\n    <FeatureDataObjectsVersion>${FDOVER_MAJOR_MINOR_REV}.0</FeatureDataObjectsVersion>" >> ${providersxml}
 			echo -ne "\n    <LibraryPath>libFdoPostgreSQL.so</LibraryPath>" >> ${providersxml}
 			echo -ne "\n  </FeatureProvider>" >> ${providersxml}
-			;;
-		  mysql)
 			echo "Registering MySQL Provider"
 			echo -ne "\n  <FeatureProvider>" >> ${providersxml}
 			echo -ne "\n    <Name>OSGeo.MySQL.${FDOVER_MAJOR_MINOR}</Name>" >> ${providersxml}
@@ -208,6 +192,18 @@
 			echo -ne "\n    <LibraryPath>libFdoMySQL.so</LibraryPath>" >> ${providersxml}
 			echo -ne "\n  </FeatureProvider>" >> ${providersxml}
 			;;
+		  ogr)
+			echo "Registering OGR Provider"
+			echo -ne "\n  <FeatureProvider>" >> ${providersxml}
+			echo -ne "\n    <Name>OSGeo.OGR.${FDOVER_MAJOR_MINOR}</Name>" >> ${providersxml}
+			echo -ne "\n    <DisplayName>OSGeo FDO Provider for OGR</DisplayName>" >> ${providersxml}
+			echo -ne "\n    <Description>FDO Access to OGR Data Sources</Description>" >> ${providersxml}
+			echo -ne "\n    <IsManaged>False</IsManaged>" >> ${providersxml}
+			echo -ne "\n    <Version>${FDOVER_MAJOR_MINOR_REV}.0</Version>" >> ${providersxml}
+			echo -ne "\n    <FeatureDataObjectsVersion>${FDOVER_MAJOR_MINOR_REV}.0</FeatureDataObjectsVersion>" >> ${providersxml}
+			echo -ne "\n    <LibraryPath>libOGRProvider.so</LibraryPath>" >> ${providersxml}
+			echo -ne "\n  </FeatureProvider>" >> ${providersxml}
+			;;
 		  sdf)
 			echo "Registering SDF Provider"
 			echo -ne "\n  <FeatureProvider>" >> ${providersxml}