[mapguide-commits] r8155 - trunk/Tools/JenkinsCI

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Sat May 24 04:38:30 PDT 2014


Author: jng
Date: 2014-05-24 04:38:30 -0700 (Sat, 24 May 2014)
New Revision: 8155

Modified:
   trunk/Tools/JenkinsCI/readme.txt
Log:
Update readme.txt

Modified: trunk/Tools/JenkinsCI/readme.txt
===================================================================
--- trunk/Tools/JenkinsCI/readme.txt	2014-05-24 10:12:31 UTC (rev 8154)
+++ trunk/Tools/JenkinsCI/readme.txt	2014-05-24 11:38:30 UTC (rev 8155)
@@ -6,19 +6,18 @@
 
 == Manually triggered from the Jenkins dashboard ==
 
- * FDO 3.8 (32-bit/64-bit)
+ * FDO 3.9 (32-bit/64-bit)
     * Prepared for MapGuide/mg-desktop. No distribution tarballs as we can't build the ArcSDE provider
- * MapGuide Open Source 2.5 (32-bit/64-bit)
+ * MapGuide Open Source 2.6 (32-bit/64-bit)
     * Windows Installer (32-bit/64-bit)
     * InstantSetup bundles (32-bit/64-bit)
- * mg-desktop 2.5 (32-bit/64-bit)
+ * mg-desktop 2.6 (32-bit/64-bit)
     * nuget packages (32-bit/64-bit)
     * zip distributions (32-bit/64-bit)
 
 == Automatically triggered by Jenkins (off of svn commit polling) ==
 
- * MapGuide Maestro 5.0
- * MapGuide Maestro 4.0.x
+ * MapGuide Maestro trunk
 
 Required Tools
 ==============
@@ -27,45 +26,32 @@
 and/or MapGuide/FDO setenvironment.bat to point to the correct locations
 
  * Microsoft .net Framework 4.0
- * Microsoft Visual C++ Express 2010 with Service Pack 1
- * Windows SDK 7.1 (64-bit)
- * Java SDK 6u33 (32/64-bit)
- * Java SDK 7u13 (32/64-bit)
- * Jenkins 1.465
+ * Microsoft Visual Studio 2012 Express for Windows Desktop
+ * Java SDK 6 (32/64-bit)
+ * Java SDK 7 (32/64-bit)
+ * Jenkins
  * 7-zip 9.20
  * ActivePerl 5.14.2 (64-bit)
  * ActiveState ActivePython 2.7.2.5 (64-bit)
  * GNU Bison 2.4.1
  * GNU sed 4.2.1
  * Sandcastle Help File Builder 1.9.4.0
- * TortoiseSVN 1.6.x
- * Slik Subversion 1.6.x
+ * TortoiseSVN 1.8.x
+ * Slik Subversion 1.8.x
  * Windows Installer XML Toolset 3.5
- * Visual C++ SP1 compiler update for Windows SDK (KB2519277)
  * Apache Ant 1.8.3
  * MySQL Connector C SDK 6.0.2
  * Oracle Instant Client 11.2 SDK
- * Doxygen 1.8.0
+ * Doxygen 1.8.0 (must be this specific version)
  * GraphViz 2.30
  * NASM (Netwide Assembler) 2.10
  * Microsoft HTML Workshop (32-bit)
  * Sphinx (http://sphinx.pocoo.org)
 
-VS Installation Order
-=====================
-
-Visual C++ 2010 Express
-Windows SDK v7.1 (with Visual C++ compilers option DISABLED and .net tools + reference assemblies ENABLED)
- - Disable C++ compilers because SP1 will remove them (!)
- - Enable .net options because they are required for building C++/CLI code
-Visual Studio 2010 SP1
-Visual C++ SP1 compiler update for Windows SDK (KB2519277)
-
 Filesystem layout
 =================
 
-* Currently configured for MGOS 2.5 and FDO 3.8, adjust these version numbers as necessary
-* Will need to revisit for MGOS 2.6 and FDO 3.9 as we'll be moving to VS2012. Fortunately, building with free MS tools is *much* simpler in VS2012.
+* Currently configured for MGOS 2.6 and FDO 3.9, adjust these version numbers as necessary
 
 C:\apache-ant-1.8.3     [extracted location of apache ant v1.8.3]
 C:\builds               [all build artifacts produced by Jenkins will be here]
@@ -78,14 +64,14 @@
             oracle      [extract 32-bit oracle 11.2 instant client sdk here]
             oracle_x64  [extract 64-bit oracle 11.2 instant client sdk here]
         fdo_extras      [Optional files to overlay on top of build result]
-            3.8.0
+            3.9.0
                 x64     [extract/copy ArcSDE dlls and providers.xml from FDO SDK]
                 x86     [extract/copy ArcSDE dlls and providers.xml from FDO SDK]
     sources
-        fdo-3.8         [svn checkout of http://svn.osgeo.org/fdo/branches/3.8]
-        mg-2.5
-            Installer   [svn checkout of http://svn.osgeo.org/mapguide/branches/2.5/Installer]
-            MgDev       [svn checkout of http://svn.osgeo.org/mapguide/branches/2.5/MgDev]
+        fdo-3.9         [svn checkout of http://svn.osgeo.org/fdo/branches/3.9]
+        mg-2.6
+            Installer   [svn checkout of http://svn.osgeo.org/mapguide/branches/2.6/Installer]
+            MgDev       [svn checkout of http://svn.osgeo.org/mapguide/branches/2.6/MgDev]
     JenkinsCI           [svn checkout of http://svn.osgeo.org/mapguide/trunk/Tools/JenkinsCI]
         home
             slave_win   [the path of JENKINS_HOME]
@@ -94,6 +80,7 @@
 ========================
  
  * MSBuild
+ * TextFinder
 
 Jenkins Post-install config
 ===========================
@@ -103,7 +90,6 @@
     * MG_TOOL_PATH = C:\working\JenkinsCI\tools
     * MG_LIB_ROOT = C:\working\libs
     * MG_BUILD_AREA = C:\working\build_area
-    * WINDOWS_SDK_71_ROOT = C:\Program Files\Microsoft SDKs\Windows\v7.1
     * ANT_HOME = C:\apache-ant-1.8.3
 
 PATH environment variable
@@ -131,6 +117,15 @@
  * 7z
  * sphinx-build
 
+Updating svn working copies
+===========================
+
+SVN working copies under C:\working\sources have to be manually updated. You can run svnupdate.bat and setrevnums.bat under C:\working\JenkinsCI\tools to do this.
+
+The reason these SVN working copies have to be manually updated is to eliminate svn contention for the working copy directory when running FDO and MapGuide build 
+jobs in parallel. There were many build failures in the past due to svn operations done from within the build jobs causing lock and sharing violation issues on 
+the working copy directories. Making svn-related operations manual and outside of the build jobs eliminates this issue.
+
 Jenkins MapGuide/FDO build process
 ==================================
 
@@ -143,6 +138,4 @@
 TODO
 ====
 
- * Regularly scheduled job to auto svn update the working copies and to trigger new MapGuide/FDO builds off of that
- * Equivalent Ubuntu/CentOS build/job configurations
- * Aggregate all the Windows/Linux build environments into a master/slave configuration.
\ No newline at end of file
+ * Regularly scheduled job to auto svn update the working copies and to trigger new MapGuide/FDO builds off of that
\ No newline at end of file



More information about the mapguide-commits mailing list