Changes between Version 3 and Version 4 of MapGuideRfc149

Timestamp:

Jun 2, 2015, 4:47:07 AM (9 years ago)

Author:

jng

Comment:

--

MapGuideRfc149

@@ -9 +9 @@
 ||RFC Template Version||(1.0)||
 ||Submission Date||28 May 2015||
-||Last Modified||||
+||Last Modified||2 Jun 2015||
 ||Author||Jackie Ng||
 ||RFC Status||draft||
@@ -45 +45 @@
 == Solution ==
 
-The Oem tree will be moved up one level to become a sibling of MgDev
+The majority of the Oem tree will be moved up one level to become a sibling of MgDev. 
+
+The proposed tree layout is as follows (only applicable directories shown for brevity):
+
+{{{
+/trunk
+   /Oem
+      /ACE
+      /CppUnit-1.9.14
+      /CsMap [svn external to CS-Map SVN repo]
+      /dbxml
+      /DWFTK
+      /FDO
+      /gd
+      /geos
+      /httpd
+      /jsoncpp
+      /LinuxApt
+      /php
+      /SQLite
+      /SWIGEx
+      /WebTools [moved from MgDev/BuildTools/WebTools]
+   /MgDev
+      /Oem
+         /agg-2.4
+         /fusion [svn external to fusion SVN repo]
+         /fusionMG
+}}}
+
+As can be seen, not all of Oem is moved up. The reasons for keeping some directories within MgDev/Oem are:
+ * agg-2.4: AGG is not built as a library on Windows. Its source files are referenced by the Renderers project on Windows at the source level. Moving this out of Oem is unnecessary given is negligible size.
+ * fusion: Fusion is not so much an external library, but rather a MapGuide-specific application framework that happens to sit in an external repository, so moving this out is also unnecessary. It is also somewhat negligible in size.
+ * fusionMG: Same "external library" and size reason as fusion
+
+The release branching strategy under this new layout is to make a branch-specific root directory and branch the respective `Oem` and `MgDev` directories from trunk into this branch-specific root directory. The respective Fusion and CS-Map external references will be updated to point to their respective release-specific branches
+
+For example, a 3.1 release branch would look like this (again, relevant directories shown for brevity):
+
+{{{
+
+/branches/3.1
+    /Oem [branched from /trunk/Oem]
+        /CsMap [svn external pointing to release-specific branch of CS-Map]
+    /MgDev [branched from /trunk/MgDev]
+        /Oem
+            /fusion [svn external pointing to release-specific branch of Fusion]
+}}}
 
 A new build script will be added to Oem that will build all Oem compoents and package the resulting headers/libs/dlls into a "buildpack" archive. To keep this archive as small as possible, anything that is not a header, import library or dll (so's in Linux) is omitted.