Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [3p-dev] News 3P 
Bonjour,

Le 08/07/2013 14:59, Pierre Gaufillet a écrit :

Hélas, le compte de Mélanie ne permet pas encore d'accéder au repo git
(bug levé pour le webmaster Eclipse : en attente de réponse).
Je ne peux toujours pas commiter sur le repo 3p. J'ai levé le bug suivant : https://bugs.eclipse.org/bugs/show_bug.cgi?id=412508 


Si le problème n'est pas résolu d'ici demain midi, nous ferons appel à
vous, Benoit et Matthieu, pour remonter les modifs. Si vous pouviez
promouvoir le build en 1.0M1 ensuite et nourrir la page de download, ce
serait top.


Ci-joint vous trouverez donc les patchs réalisés avec Pierre.
Ces patchs s'appliquent depuis le commit 8c99987 org.polarsys.ide.releng, il suffit alors d'exécuter git am *.patch. 

Bonne journée,
Mélanie

>From 08feea796a5a9477a54d161d82ec27bc5fa17734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lanie=20Bats?= <melanie.bats@xxxxxxx>
Date: Mon, 8 Jul 2013 12:01:28 +0200
Subject: [PATCH 1/2] Update tycho version and remove plugin repositories
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mélanie Bats <melanie.bats@xxxxxxx>
---
 .../org.polarsys.ide.releng.tycho.parent/pom.xml   |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/releng/org.polarsys.ide.releng.tycho.parent/pom.xml b/releng/org.polarsys.ide.releng.tycho.parent/pom.xml
index e113e6a..0443d40 100644
--- a/releng/org.polarsys.ide.releng.tycho.parent/pom.xml
+++ b/releng/org.polarsys.ide.releng.tycho.parent/pom.xml
@@ -14,14 +14,8 @@
 	</prerequisites>
 
 	<properties>
-		<tycho-version>0.17.0-SNAPSHOT</tycho-version>
+		<tycho-version>0.18.0</tycho-version>
 	</properties>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>tycho-snapshots</id>
-			<url>https://oss.sonatype.org/content/groups/public/</url>
-		</pluginRepository>
-	</pluginRepositories>
 	<repositories>
 		<!-- configure p2 repository to resolve against -->
 		<repository>
-- 
1.7.9.5


>From 1017fb5fb89081b43823fefdda8b5d62d3fd2e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lanie=20Bats?= <melanie.bats@xxxxxxx>
Date: Mon, 8 Jul 2013 12:21:34 +0200
Subject: [PATCH 2/2] Fix Kepler configuration and icns path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mélanie Bats <melanie.bats@xxxxxxx>
---
 features/org.polarsys.ide.feature/feature.xml      |    8 ++-----
 features/org.polarsys.ide.feature/pom.xml          |    4 ++--
 plugins/org.polarsys.ide/META-INF/MANIFEST.MF      |    2 +-
 .../OSGI-INF/l10n/bundle.properties                |    2 +-
 plugins/org.polarsys.ide/pom.xml                   |    4 ++--
 .../org.polarsys.ide.releng.tycho.parent/pom.xml   |   24 ++++++++++----------
 .../category.xml                                   |    2 +-
 .../polarsys.p2.inf                                |    7 +++++-
 .../polarsys.product                               |    4 ++--
 .../org.polarsys.ide.releng.tycho.products/pom.xml |    4 ++--
 .../category.xml                                   |    2 +-
 .../pom.xml                                        |    4 ++--
 12 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/features/org.polarsys.ide.feature/feature.xml b/features/org.polarsys.ide.feature/feature.xml
index 3b01e49..c76b691 100644
--- a/features/org.polarsys.ide.feature/feature.xml
+++ b/features/org.polarsys.ide.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.ide"
       label="%featureName"
-      version="0.1.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.polarsys.org";>
@@ -22,7 +22,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.acceleo.sdk"
+         id="org.eclipse.acceleo"
          version="0.0.0"/>
 
    <includes
@@ -151,10 +151,6 @@
          os="linux"/>
 
    <includes
-         id="org.eclipse.ui.juno.feature"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.egit.mylyn"
          version="0.0.0"/>
 
diff --git a/features/org.polarsys.ide.feature/pom.xml b/features/org.polarsys.ide.feature/pom.xml
index de33518..5b9d4e6 100644
--- a/features/org.polarsys.ide.feature/pom.xml
+++ b/features/org.polarsys.ide.feature/pom.xml
@@ -7,10 +7,10 @@
 		<artifactId>org.polarsys.ide.releng.tycho.parent</artifactId>
 		<groupId>org.polarsys</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.polarsys.ide.releng.tycho.parent</relativePath>
+		<relativePath>../../releng/org.polarsys.ide.releng.tycho.parent</relativePath>
 	</parent>
 	<groupId>org.polarsys.features</groupId>
 	<artifactId>org.polarsys.ide</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/plugins/org.polarsys.ide/META-INF/MANIFEST.MF b/plugins/org.polarsys.ide/META-INF/MANIFEST.MF
index 7936f34..8809203 100644
--- a/plugins/org.polarsys.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.ide;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.polarsys.ide/OSGI-INF/l10n/bundle.properties b/plugins/org.polarsys.ide/OSGI-INF/l10n/bundle.properties
index 7efac5d..a4f1485 100644
--- a/plugins/org.polarsys.ide/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.polarsys.ide/OSGI-INF/l10n/bundle.properties
@@ -4,7 +4,7 @@ Bundle-Name = PolarSys IDE
 productName = PolarSys IDE
 productBlurb=PolarSys IDE\n\
 \n\
-Version: 0.1\n\
+Version: 1.0\n\
 \n\
 (c) Copyright Eclipse contributors and others 2000, 2013.  All rights reserved.\n\
 Visit http://www.polarsys.org and http://www.eclipse.org\n\
diff --git a/plugins/org.polarsys.ide/pom.xml b/plugins/org.polarsys.ide/pom.xml
index 64e057c..00a454a 100644
--- a/plugins/org.polarsys.ide/pom.xml
+++ b/plugins/org.polarsys.ide/pom.xml
@@ -6,9 +6,9 @@
     <artifactId>org.polarsys.ide.releng.tycho.parent</artifactId>
     <groupId>org.polarsys</groupId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../org.polarsys.ide.releng.tycho.parent</relativePath>
+    <relativePath>../../releng/org.polarsys.ide.releng.tycho.parent</relativePath>
   </parent>
   <artifactId>org.polarsys.ide</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/releng/org.polarsys.ide.releng.tycho.parent/pom.xml b/releng/org.polarsys.ide.releng.tycho.parent/pom.xml
index 0443d40..b030425 100644
--- a/releng/org.polarsys.ide.releng.tycho.parent/pom.xml
+++ b/releng/org.polarsys.ide.releng.tycho.parent/pom.xml
@@ -19,16 +19,16 @@
 	<repositories>
 		<!-- configure p2 repository to resolve against -->
 		<repository>
-			<id>juno SR1</id>
+			<id>Kepler</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/juno</url>
+			<url>http://download.eclipse.org/releases/kepler</url>
 			<!-- <url>http://eclipse.ialto.com/releases/juno</url> -->
 		</repository>
 		<repository>
-			<id>eclipse-update SR2</id>
+			<id>eclipse-update</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/eclipse/updates/4.2</url>
-			<!-- <url>http://eclipse.ialto.com/eclipse/updates/4.2</url> -->
+			<url>http://download.eclipse.org/eclipse/updates/4.3</url>
+			<!-- <url>http://eclipse.ialto.com/eclipse/updates/4.3</url> -->
 		</repository>
 		<!-- <repository> -->
 		<!-- <id>subversive 0.7</id> -->
@@ -72,11 +72,11 @@
 						<!-- <ws>gtk</ws> -->
 						<!-- <arch>x86</arch> -->
 						<!-- </environment> -->
-						<!-- <environment> -->
-						<!-- <os>win32</os> -->
-						<!-- <ws>win32</ws> -->
-						<!-- <arch>x86_64</arch> -->
-						<!-- </environment> -->
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment> -->
 						<environment>
 							<os>macosx</os>
 							<ws>cocoa</ws>
@@ -128,8 +128,8 @@
 		</plugins>
 	</build>
 	<modules>
-		<module>../org.polarsys.ide</module>
-		<module>../org.polarsys.ide.feature</module>
+		<module>../../plugins/org.polarsys.ide</module>
+		<module>../../features/org.polarsys.ide.feature</module>
 		<!-- <module>../org.polarsys.ide.releng.tycho.repository</module> -->
 		<module>../org.polarsys.ide.releng.tycho.products</module>
 	</modules>
diff --git a/releng/org.polarsys.ide.releng.tycho.products/category.xml b/releng/org.polarsys.ide.releng.tycho.products/category.xml
index 51a4a8f..c05e18b 100644
--- a/releng/org.polarsys.ide.releng.tycho.products/category.xml
+++ b/releng/org.polarsys.ide.releng.tycho.products/category.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.polarsys.ide_0.1.0.qualifier.jar" id="org.polarsys.ide" version="0.1.0.qualifier"/>
+   <feature url="features/org.polarsys.ide_1.0.0.qualifier.jar" id="org.polarsys.ide" version="1.0.0.qualifier"/>
 </site>
diff --git a/releng/org.polarsys.ide.releng.tycho.products/polarsys.p2.inf b/releng/org.polarsys.ide.releng.tycho.products/polarsys.p2.inf
index e1abe67..1f088df 100644
--- a/releng/org.polarsys.ide.releng.tycho.products/polarsys.p2.inf
+++ b/releng/org.polarsys.ide.releng.tycho.products/polarsys.p2.inf
@@ -1,4 +1,9 @@
 instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipsec.exe);
 instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.exe);
-instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.rmdir(path:${installFolder}/Eclipse.app);
+instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents/Resources/Eclipse.icns);
+instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents/Resources);
+instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents/Info.plist);
+instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents/MacOS);
+instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents);
+instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app);
 instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
diff --git a/releng/org.polarsys.ide.releng.tycho.products/polarsys.product b/releng/org.polarsys.ide.releng.tycho.products/polarsys.product
index e25fe06..b3589fc 100644
--- a/releng/org.polarsys.ide.releng.tycho.products/polarsys.product
+++ b/releng/org.polarsys.ide.releng.tycho.products/polarsys.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="PolarSys IDE" uid="org.polarsys.ide.product" id="org.polarsys.ide.product" application="org.eclipse.ui.ide.workbench" version="0.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="PolarSys IDE" uid="org.polarsys.ide.product" id="org.polarsys.ide.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -20,7 +20,7 @@
       startupMessageRect="7,4,445,14"
       startupForegroundColor="000000" />
    <launcher name="polarsys">
-      <macosx icon="../../../../org.polarsys.ide/icons/polarsys.icns"/>
+      <macosx icon="../../../../../plugins/org.polarsys.ide/icons/polarsys.icns"/>
       <solaris/>
       <win useIco="false">
          <bmp/>
diff --git a/releng/org.polarsys.ide.releng.tycho.products/pom.xml b/releng/org.polarsys.ide.releng.tycho.products/pom.xml
index 3d68819..1b1d049 100644
--- a/releng/org.polarsys.ide.releng.tycho.products/pom.xml
+++ b/releng/org.polarsys.ide.releng.tycho.products/pom.xml
@@ -6,9 +6,9 @@
   	<groupId>org.polarsys</groupId>
   	<artifactId>org.polarsys.ide.releng.tycho.parent</artifactId>
   	<version>1.0.0-SNAPSHOT</version>
-  	<relativePath>../org.polarsys.ide.releng.tycho.parent</relativePath>
+  	<relativePath>../../releng/org.polarsys.ide.releng.tycho.parent</relativePath>
   </parent>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
 	<build>
 		<plugins>
 			<plugin>
diff --git a/releng/org.polarsys.ide.releng.tycho.repository/category.xml b/releng/org.polarsys.ide.releng.tycho.repository/category.xml
index f2e0145..2331adb 100644
--- a/releng/org.polarsys.ide.releng.tycho.repository/category.xml
+++ b/releng/org.polarsys.ide.releng.tycho.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.polarsys.ide.feature_0.1.0.qualifier.jar" id="org.polarsys.ide.feature" version="0.1.0.qualifier">
+   <feature url="features/org.polarsys.ide.feature_1.0.0.qualifier.jar" id="org.polarsys.ide.feature" version="1.0.0.qualifier">
       <category name="org.polarsys"/>
    </feature>
    <category-def name="org.polarsys" label="Polarsys"/>
diff --git a/releng/org.polarsys.ide.releng.tycho.repository/pom.xml b/releng/org.polarsys.ide.releng.tycho.repository/pom.xml
index 4e9a258..62ee229 100644
--- a/releng/org.polarsys.ide.releng.tycho.repository/pom.xml
+++ b/releng/org.polarsys.ide.releng.tycho.repository/pom.xml
@@ -5,9 +5,9 @@
 		<artifactId>org.polarsys.ide.releng.tycho.parent</artifactId>
 		<groupId>org.polarsys</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.polarsys.ide.releng.tycho.parent</relativePath>
+		<relativePath>../../releng/org.polarsys.ide.releng.tycho.parent</relativePath>
 	</parent>
 	<artifactId>org.polarsys.ide.releng.tycho.repository</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 </project>
\ No newline at end of file
-- 
1.7.9.5

Back to the top