geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r421477 - /geronimo/sandbox/svkmerge/m2migration/bootstrap
Date Thu, 13 Jul 2006 02:11:02 GMT
Author: jdillon
Date: Wed Jul 12 19:11:02 2006
New Revision: 421477

URL: http://svn.apache.org/viewvc?rev=421477&view=rev
Log:
Put all custom bits into thirdparty
Don't need to build TranQL anymore

Modified:
    geronimo/sandbox/svkmerge/m2migration/bootstrap

Modified: geronimo/sandbox/svkmerge/m2migration/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/bootstrap?rev=421477&r1=421476&r2=421477&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/bootstrap (original)
+++ geronimo/sandbox/svkmerge/m2migration/bootstrap Wed Jul 12 19:11:02 2006
@@ -40,6 +40,9 @@
     
     rm -rf ~/.m2/repository
     
+    rm -rf "$DIRNAME/thirdparty"
+    mkdir -p "$DIRNAME/thirdparty"
+    
     for x in `find "$DIRNAME" -name target -type d`; do
         rm -rf "$x"
     done
@@ -61,17 +64,18 @@
 m2assemblyplugin() {
     echo "Building Patched maven-assembly-plugin..."
     
-    rm -rf thirdparty
-    mkdir -p thirdparty
     (
-        cd thirdparty
+        cd "$DIRNAME/thirdparty"
+        
         svn co http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin
         
         cd maven-assembly-plugin
         
+        # Apply mappers patch
         wget http://issues.apache.org/jira/secure/attachment/12336456/maven-assembly-plugin.patch
         patch -p0 < maven-assembly-plugin.patch
         
+        # Apply files/file/fileMode patch
         wget http://jira.codehaus.org/secure/attachment/21493/MASSEMBLY-127.diff
         patch -p0 < MASSEMBLY-127.diff
         
@@ -89,9 +93,11 @@
 genesis() {
     echo "Building Genesis..."
     
-    rm -rf genesis
-    svn co https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/genesis
     (
+        cd "$DIRNAME/thirdparty"
+        
+        svn co https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/genesis
+        
         cd genesis
         ./bootstrap
         
@@ -101,30 +107,12 @@
     )
 }
 
-thirdparty() {
+openejb2() {
     # Build thirdparty components
-    echo "Building thirdparty..."
+    echo "Building OpenEJB2..."
     
-    rm -rf thirdparty
-    mkdir -p thirdparty
     (
-        cd thirdparty
-        
-        # Build TranQL
-        echo "Building TranQL..."
-        
-        svn co https://svn.codehaus.org/tranql/trunk tranql
-        (
-            cd tranql
-            mvn -Dmaven.test.skip=true install
-            
-            if [ "$?" != "0" ]; then
-                die "Bootstrap failed building TranQL"
-            fi
-        )
-        
-        # Build OpenEJB
-        echo "Building OpenEJB..."
+        cd "$DIRNAME/thirdparty"
         
         svn co https://svn.codehaus.org/openejb/trunk/openejb2 openejb2
         (
@@ -148,7 +136,7 @@
         m2assemblyplugin && \
         genesis && \
         stage "bootstrap" && \
-        thirdparty && \
+        openejb2 && \
         stage "assemble"
     ) && complete $?
 }



Mime
View raw message