[TASK] prepare to include Flow 2.1 release

neos · Dec 12, 2013 · 8ad251c · 8ad251c
1 parent 35f16a0
commit 8ad251c
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,7 @@ update-changes.sh
 /composer.phar
 /Neos-master/
 /Neos-1.0/
+/Flow-master/
+/Flow-2.X/
+/FLOW3-1.0/
+/FLOW3-1.1/
diff --git a/flow3-base-dist-jenkins.php → flow-base-dist.php b/flow3-base-dist-jenkins.php → flow-base-dist.php
@@ -1,22 +1,24 @@
 <?php
-// configuration for FLOW3 base distribution in Jenkins CI job
+// configuration for TYPO3 Flow base distribution in Jenkins CI job
 
-$gitRoot = getenv('WORKSPACE') . '/';
+$baseDirectory = (getenv('WORKSPACE') ? getenv('WORKSPACE') . '/' : getcwd() . '/');
+$gitRoot = $baseDirectory;
 $gitRootIsWorkingCopy = TRUE;
-$htmlFile = getenv('WORKSPACE') . '/index.html';
+$htmlFile = $baseDirectory . 'index.html';
 
 $reviewLinkPattern = "https://review.typo3.org/#/q/tr:%s,n,z";
 
 $issueMapping = array();
 
 $projectsToCheck = array(
-	'FLOW3 Base Dist' => array(
+	'TYPO3 Flow Base Dist' => array(
 		'gitWebUrl' => 'http://git.typo3.org/Flow/Distributions/Base.git',
 		'releases' => array(
 				# project, starting point, branch, working copy path
 			array('1.0', 'refs/tags/1.0.0', 'origin/FLOW3-1.0', 'FLOW3-1.0'),
 			array('1.1', 'refs/tags/1.0.0', 'origin/FLOW3-1.1', 'FLOW3-1.1'),
-			array('2.0', 'refs/tags/1.0.0', 'origin/2.0', 'Flow-2.0'),
+			array('2.0', 'refs/tags/1.0.0', 'origin/2.0', 'Flow-2.X'),
+			array('2.1', 'refs/tags/1.0.0', 'origin/2.1', 'Flow-2.X'),
 			array('master', 'refs/tags/1.0.0', 'origin/master', 'Flow-master'),
 		),
 	),
@@ -25,7 +27,8 @@
 		'releases' => array(
 			array('1.0', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.0', 'FLOW3-1.0/Packages/Framework/TYPO3.FLOW3'),
 			array('1.1', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.1', 'FLOW3-1.1/Packages/Framework/TYPO3.FLOW3'),
-			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-master/Packages/Framework/TYPO3.Flow'),
+			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-2.X/Packages/Framework/TYPO3.Flow'),
+			array('2.1', 'refs/tags/FLOW3-1.0.0', 'origin/2.1', 'Flow-2.X/Packages/Framework/TYPO3.Flow'),
 			array('master', 'refs/tags/FLOW3-1.0.0', 'origin/master', 'Flow-master/Packages/Framework/TYPO3.Flow'),
 		),
 	),
@@ -34,7 +37,8 @@
 		'releases' => array(
 			array('1.0', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.0', 'FLOW3-1.0/Packages/Framework/TYPO3.Fluid'),
 			array('1.1', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.1', 'FLOW3-1.1/Packages/Framework/TYPO3.Fluid'),
-			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-master/Packages/Framework/TYPO3.Fluid'),
+			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-2.X/Packages/Framework/TYPO3.Fluid'),
+			array('2.1', 'refs/tags/FLOW3-1.0.0', 'origin/2.1', 'Flow-2.X/Packages/Framework/TYPO3.Fluid'),
 			array('master', 'refs/tags/FLOW3-1.0.0', 'origin/master', 'Flow-master/Packages/Framework/TYPO3.Fluid'),
 		),
 	),
@@ -43,7 +47,8 @@
 		'releases' => array(
 			array('1.0', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.0', 'FLOW3-1.0/Packages/Framework/TYPO3.Party'),
 			array('1.1', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.1', 'FLOW3-1.1/Packages/Framework/TYPO3.Party'),
-			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-master/Packages/Framework/TYPO3.Party'),
+			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-2.X/Packages/Framework/TYPO3.Party'),
+			array('2.1', 'refs/tags/FLOW3-1.0.0', 'origin/2.1', 'Flow-2.X/Packages/Framework/TYPO3.Party'),
 			array('master', 'refs/tags/FLOW3-1.0.0', 'origin/master', 'Flow-master/Packages/Framework/TYPO3.Party'),
 		),
 	),
@@ -52,7 +57,8 @@
 		'releases' => array(
 			array('1.0', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.0', 'FLOW3-1.0/Packages/Framework/TYPO3.Kickstart'),
 			array('1.1', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.1', 'FLOW3-1.1/Packages/Framework/TYPO3.Kickstart'),
-			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-master/Packages/Framework/TYPO3.Kickstart'),
+			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-2.X/Packages/Framework/TYPO3.Kickstart'),
+			array('2.1', 'refs/tags/FLOW3-1.0.0', 'origin/2.1', 'Flow-2.X/Packages/Framework/TYPO3.Kickstart'),
 			array('master', 'refs/tags/FLOW3-1.0.0', 'origin/master', 'Flow-master/Packages/Framework/TYPO3.Kickstart'),
 		),
 	),
@@ -61,7 +67,8 @@
 		'releases' => array(
 			array('1.0', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.0', 'FLOW3-1.0/Packages/Framework/TYPO3.Welcome'),
 			array('1.1', 'refs/tags/FLOW3-1.0.0', 'origin/FLOW3-1.1', 'FLOW3-1.1/Packages/Framework/TYPO3.Welcome'),
-			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-master/Packages/Framework/TYPO3.Welcome'),
+			array('2.0', 'refs/tags/FLOW3-1.0.0', 'origin/2.0', 'Flow-2.X/Packages/Framework/TYPO3.Welcome'),
+			array('2.1', 'refs/tags/FLOW3-1.0.0', 'origin/2.1', 'Flow-2.X/Packages/Framework/TYPO3.Welcome'),
 			array('master', 'refs/tags/FLOW3-1.0.0', 'origin/master', 'Flow-master/Packages/Framework/TYPO3.Welcome'),
 		),
 	),

diff --git a/setup-flow-checkout.sh b/setup-flow-checkout.sh
@@ -0,0 +1,19 @@
+if [ ! -d "Flow-master" ]; then
+    git clone git://git.typo3.org/Flow/Distributions/Base.git Flow-master
+    curl -s http://getcomposer.org/installer | php
+    cd Flow-master
+    php ../composer.phar --no-interaction install --dev --prefer-source    
+    cd ..
+fi
+
+if [ ! -d "Flow-2.X" ]; then
+    cp -Ra Flow-master Flow-2.X
+fi
+
+if [ ! -d "FLOW3-1.1" ]; then
+    git clone -b FLOW3-1.1 --recursive git://git.typo3.org/Flow/Distributions/Base.git FLOW3-1.1
+fi
+
+if [ ! -d "FLOW3-1.0" ]; then
+    git clone -b FLOW3-1.0 --recursive git://git.typo3.org/Flow/Distributions/Base.git FLOW3-1.0
+fi