Browse Source

* url change to updates.yakindu.org/sct/kepler
* Documentation update

benjamin.schwertfeger@googlemail.com 12 years ago
parent
commit
cd21296c7d

+ 1 - 1
features/org.yakindu.sct-feature/feature.xml

@@ -19,7 +19,7 @@
    </license>
 
    <url>
-      <discovery label="Yakindu SCT Repository" url="http://updates.yakindu.org/kepler/releases"/>
+      <discovery label="Yakindu SCT Repository" url="http://updates.yakindu.org/sct/kepler/releases"/>
    </url>
 
    <requires>

+ 2 - 2
features/org.yakindu.sct-feature/p2.inf

@@ -1,3 +1,3 @@
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//updates.yakindu.org/kepler/releases/,name:Yakindu SCT 2,enabled:true);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//updates.yakindu.org/kepler/releases/,name:Yakindu SCT 2,enabled:true);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//updates.yakindu.org/sct/kepler/releases/,name:Yakindu SCT 2,enabled:true);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//updates.yakindu.org/sct/kepler/releases/,name:Yakindu SCT 2,enabled:true);

+ 1 - 1
plugins/org.yakindu.sct.doc.user/help/02_Getting_started/getting_started.html

@@ -11,7 +11,7 @@
 		<p>For a new installation</p>
 		<ul>
 			<li>choose Eclipse menu Help/Install New Software ...</li>
-			<li>press the &#8218;add&#8217; button in the top right corner of the installation wizard to add http://updates.yakindu.org/kepler/releases as update site</li>
+			<li>press the &#8218;add&#8217; button in the top right corner of the installation wizard to add http://updates.yakindu.org/sct/kepler/releases as update site</li>
 			<li>select all the listed features</li>
 			<li>and follow the installation wizzard </li>
 			<li>For updating the installed plugins select Help/Check for Updates...</li>

+ 1 - 1
plugins/org.yakindu.sct.doc.user/help/02_Getting_started/getting_started.textile

@@ -4,7 +4,7 @@ h3. Installation
 
 For a new installation
 * choose Eclipse menu Help/Install New Software ...
-* press the 'add' button in the top right corner of the installation wizard to add http://updates.yakindu.org/kepler/releases as update site
+* press the 'add' button in the top right corner of the installation wizard to add http://updates.yakindu.org/sct/kepler/releases as update site
 * select all the listed features
 * and follow the installation wizzard 
 * For updating the installed plugins select Help/Check for Updates...

+ 11 - 0
releng/org.yakindu.sct.releng/.project

@@ -8,4 +8,15 @@
 	</buildSpec>
 	<natures>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1373535841715</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

+ 4 - 3
releng/org.yakindu.sct.releng/hudson.promote.README

@@ -29,10 +29,10 @@ Parameterized-build:
 		This should only be set to false, if the promotion is to a new repository location.
 
 + Text
-	Name: base_target_job
+	Name: additionalFeatureRepositories
 	Default: http://download.eclipse.org/releases/kepler
 	Description:
-		Location of repository used for additional features
+		Lcoation of repository used for additional dependencies, like xtext, for packaged product. At least one URL has to be set. More than one can be delimitted by a comma.
 
 + Run Parameter
 	Name: base_repository_job
@@ -56,7 +56,8 @@ Build:
 	Properties
 		promotionSource=${env.promotionSource}
 		promotionTarget=${env.promotionTarget}
-		appendToExistingRepository=${env.appendToExistingRepository}
+		AppendToExistingRepository=${env.appendToExistingRepository}
+		p2.target.repository=${env.additionalFeatureRepositories}
 	Profiles
 	JVM Options
 	Private Maven-Repository: Checked

+ 4 - 2
releng/org.yakindu.sct.releng/promote-pom.xml

@@ -19,7 +19,9 @@
 		<!-- scp settings for publishing udpdate site -->
 		<promotionTarget>kepler/integration</promotionTarget>
 		<promotionSource>http://builds.itemis.de/urlToCIJob/lastSuccessfulBuild</promotionSource>
-		<updateSiteUrl>http://updates.yakindu.org/${promotionTarget}</updateSiteUrl>
+		<p2.target.repository>http://download.eclipse.org/releases/kepler</p2.target.repository>
+		<promotionSourceRepo>${promotionSource}/artifact/update-site</promotionSourceRepo>
+		<updateSiteUrl>http://updates.yakindu.org/sct/${promotionTarget}</updateSiteUrl>
 		<local.update.site>${project.build.directory}/local-update-site</local.update.site>
 
 		<eclipse.mirror.url>http://mirror.netcologne.de/eclipse</eclipse.mirror.url>
@@ -56,7 +58,7 @@
 							<source>
 								<!-- source repositori(es) to mirror from -->
 								<repository>
-									<url>${promotionSource}artifact/update-site/</url>
+									<url>${promotionSourceRepo}</url>
 									<layout>p2</layout>
 									<!-- sypported layouts are "p2-metadata", "p2-artifacts", and "p2" 
 										(for joint repositories) -->