Google Git
Sign in
eclipse/gerrit/webtools/webtools.releng/refs/heads/david_williams_tempTest20^!/.
commit
06ed67a4ab7751784db3687ebb6db942f7cb695d
[log]
author
david_williams <david_williams>
Sun Nov 22 07:06:00 2009 +0000
committer
david_williams <david_williams>
Sun Nov 22 07:06:00 2009 +0000
tree
39294c195b538db303488a4e899523eea4ea4a0f
parent
cbd46768619381970b6dc1fdda3f9906cc6de712 [diff]
tweak so head builder can work in maintenance

diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index c9c8826..9e49d1a 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml

@@ -758,7 +758,7 @@
                     value="3.1.2"/>
                 <property
                     name="mapVersionTag"
-                    value="R3_1_maintenance"/>
+                    value="david_williams_tempTest20"/>
                 <property
                     name="releng.dali-mapVersionTag"
                     value="R2_2_maintenance"/>

diff --git a/releng.control/get-relengControl.sh b/releng.control/get-relengControl.sh
index 759af79..f1aeec7 100644
--- a/releng.control/get-relengControl.sh
+++ b/releng.control/get-relengControl.sh

@@ -33,8 +33,8 @@
 rm -fr ${RELENG_CONTROL}/.settings
 mkdir -p ${RELENG_CONTROL}
 
-#controltag=david_williams_tempBranch3
-controltag=HEAD
+controltag=david_williams_tempTest20
+#controltag=HEAD
 echo "    checking out $controltag of ${RELENG_CONTROL} from cvs ..."
 cvs -Q -f -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools  export -d ${RELENG_CONTROL} -r $controltag webtools.releng/${RELENG_CONTROL}
 

diff --git a/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml b/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml
index 2d14743..73e7513 100644
--- a/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml

@@ -60,190 +60,11 @@
                 value="wtp-tests-${buildLabel}.zip"/>
         </antcall>
     </target>
-    <target
-        name="createCodeZip">
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="premirrortasks"/>
+
     	
-        <p2.mirror 
-            source="${buildDirectory}/${buildLabel}/updateSite"
-            destination="${tempRepo}"
-            log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
-            verbose="true">
-            <slicingoptions
-                followstrict="true"
-                includeNonGreedy="false"
-                includeOptional="false"/>
-            <iu
-                id="org.eclipse.wst.web_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jpt.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xml_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.jsdt.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.common.fproj.feature.group"/>
-            <iu
-                id="org.eclipse.wst.server_adapters.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.web_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xsl.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.webpageeditor.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.cxf.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jpt.eclipselink.feature.feature.group"/>
-        </p2.mirror>
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="postmirrortasks"/>
-    </target>
-    <target
-        name="createSDKZip">
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="premirrortasks"/>
-        <p2.mirror  
-            source="${buildDirectory}/${buildLabel}/updateSite"
-            destination="${tempRepo}"
-            log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
-            verbose="true">
-            <slicingoptions
-                followstrict="true"
-                includeNonGreedy="false"
-                includeOptional="false"/>
-            <iu
-                id="org.eclipse.wst.web_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.enterprise_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jpt_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xml_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.jsdt_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.common.fproj.sdk.feature.group"/>
-            <iu
-                id="org.eclipse.wst.server_adapters.sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.web_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xsl_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.webpageeditor_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.jaxws_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.cxf_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jpt.eclipselink_sdk.feature.feature.group"/>
-        </p2.mirror>
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="postmirrortasks"/>
-    </target>
-    <target
-        name="createTestZip">
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="premirrortasks"/>
-        <p2.mirror 
-            source="${buildDirectory}/${buildLabel}/updateSite"
-            destination="${tempRepo}"
-            log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
-            verbose="true">
-            <slicingoptions
-                followstrict="true"
-                includeNonGreedy="false"
-                includeOptional="false"/>
-            <iu
-                id="org.eclipse.jpt.tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.enterprise_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.jsf.tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.ext_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.web_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.common_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.jsdt_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.server_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.web_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.ws_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xml_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wtp.releng.tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xsl_tests.feature.feature.group"/>
-            <!--
-                <iu
-                id="org.eclipse.jst.webpageeditor_sdk.feature.feature.group"/>
-                <iu
-                id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group"/>
-            -->
-            <!--
-                <iu
-                id="org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group"/>
-            -->
-            <iu
-                id="org.eclipse.jst.ws.jaxws_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.cxf_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.jaxws.dom_tests.feature.feature.group"/>
-            <!--
-                <iu
-                id="org.eclipse.jpt.eclipselink_tests.feature.feature.group"/>
-            -->
-        </p2.mirror>
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="postmirrortasks"/>
-    </target>
+    <import file="${buildDirectory}/maps/webtools.maps/releng/packages/mirrortasks.xml" /> 
+    	
+    	
+
+ 
 </project>
\ No newline at end of file