Skip to content

Commit

Permalink
[JDK17] Init commit to new building architecture
Browse files Browse the repository at this point in the history 
Bump from Tycho 2.4.0 to 2.6.0-SNAPSHOT (waiting for official release)
Bump SWT to 2021-03 to 2021-12
Bump JDK from 15 to 17
  • Loading branch information
@RoiArthurB
RoiArthurB committed Jan 7, 2022
1 parent 8057cbd commit 2bb9b44
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 32 deletions.
13 changes: 9 additions & 4 deletions msi.gama.parent/pom.xml
View file
Expand Up @@ -30,6 +30,11 @@
<url>http://buchen.github.io/maven-repo</url>
<layout>default</layout>
</pluginRepository>

<pluginRepository>
<id>tycho-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
</pluginRepository>
</pluginRepositories>


Expand Down Expand Up @@ -112,8 +117,8 @@
</repository>
-->
<repository>
<id>eclipse-2103</id>
<url>http://download.eclipse.org/releases/2021-03</url>
<id>eclipse-2112</id>
<url>http://download.eclipse.org/releases/2021-12</url>
<layout>p2</layout>
</repository>
<repository>
Expand Down Expand Up @@ -250,8 +255,8 @@
<batik.version>1.7</batik.version>
<p2-maven.version>1.2.0-SNAPSHOT</p2-maven.version>
<jetty-maven.version>8.1.5.v20120716</jetty-maven.version>
<tycho.version>2.4.0</tycho.version>
<jdk.version>15</jdk.version>
<tycho.version>2.6.0-SNAPSHOT</tycho.version>
<jdk.version>17</jdk.version>
<project.version>1.8.2-SNAPSHOT</project.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<geotools.version>14.5</geotools.version>
Expand Down
10 changes: 8 additions & 2 deletions msi.gama.processor/pom.xml
View file
Expand Up @@ -22,11 +22,17 @@
</snapshotRepository>
</distributionManagement>

<pluginRepositories>
<pluginRepository>
<id>tycho-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
</pluginRepository>
</pluginRepositories>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.version>2.4.0</tycho.version>
<jdk.version>15</jdk.version>
<tycho.version>2.6.0-SNAPSHOT</tycho.version>
<jdk.version>17</jdk.version>
</properties>

<profiles>
Expand Down
48 changes: 24 additions & 24 deletions travis/zip_withjdk.sh
View file
Expand Up @@ -53,29 +53,29 @@ RELEASEFILES[$n]="$thePATH-macosx.cocoa.x86_64_withJDK.zip"


rem111(){
sudo rm "${RELEASEFILES[0]}"
sudo rm "${RELEASEFILES[1]}"
sudo rm "${RELEASEFILES[2]}"
rm "${RELEASEFILES[0]}"
rm "${RELEASEFILES[1]}"
rm "${RELEASEFILES[2]}"



cd $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64
sudo zip -9 -qyr "${RELEASEFILES[0]}" . && echo "compressed ${RELEASEFILES[0]}" || echo "compress fail ${RELEASEFILES[0]}"
zip -9 -qyr "${RELEASEFILES[0]}" . && echo "compressed ${RELEASEFILES[0]}" || echo "compress fail ${RELEASEFILES[0]}"
cd ../../../../../../../




cd $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64
sudo zip -9 -qr "${RELEASEFILES[2]}" . && echo "compressed ${RELEASEFILES[2]}" || echo "compress fail ${RELEASEFILES[2]}"
zip -9 -qr "${RELEASEFILES[2]}" . && echo "compressed ${RELEASEFILES[2]}" || echo "compress fail ${RELEASEFILES[2]}"
cd ../../../../../../../





cd $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64
sudo zip -9 -qyr "${RELEASEFILES[1]}" . && echo "compressed ${RELEASEFILES[1]}" || echo "compress fail ${RELEASEFILES[1]}"
zip -9 -qyr "${RELEASEFILES[1]}" . && echo "compressed ${RELEASEFILES[1]}" || echo "compress fail ${RELEASEFILES[1]}"
cd ../../../../../../../

}
Expand All @@ -92,23 +92,23 @@ cd ../../../../../../../



wget -q $(curl -s https://api.github.com/repos/AdoptOpenJDK/openjdk15-binaries/releases/latest | grep "/OpenJDK15U-jdk_x64_linux_openj9_15.*.gz\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_linux_15.tar.gz"
wget -q $(curl -s https://api.github.com/repos/AdoptOpenJDK/openjdk15-binaries/releases/latest | grep "/OpenJDK15U-jdk_x64_windows_openj9_15.*.zip\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_win_15.zip"
wget -q $(curl -s https://api.github.com/repos/AdoptOpenJDK/openjdk15-binaries/releases/latest | grep "/OpenJDK15U-jdk_x64_mac_openj9_15.*.gz\"" | cut -d ':' -f 2,3 | tr -d \") -O "jdk_osx_15.tar.gz"
wget -q "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz" -O "jdk_linux_15.tar.gz"
wget -q "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_windows_hotspot_17_35.zip" -O "jdk_win_15.zip"
wget -q "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_mac_hotspot_17_35.tar.gz" -O "jdk_osx_15.tar.gz"
mkdir jdk_linux
mkdir jdk_win
mkdir jdk_osx


echo "unzip jdk linux"
tar -zxf jdk_linux_15.tar.gz -C jdk_linux/
mv jdk_linux/jdk-15* jdk_linux/jdk
mv jdk_linux/jdk-17* jdk_linux/jdk
echo "unzip jdk osx"
tar -zxf jdk_osx_15.tar.gz -C jdk_osx/
mv jdk_osx/jdk-15* jdk_osx/jdk
mv jdk_osx/jdk-17* jdk_osx/jdk
echo "unzip jdk win"
unzip -q jdk_win_15.zip -d jdk_win
mv jdk_win/jdk-15* jdk_win/jdk
mv jdk_win/jdk-17* jdk_win/jdk



Expand All @@ -120,51 +120,51 @@ mv jdk_win/jdk-15* jdk_win/jdk



sudo cp -R jdk_linux/jdk $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64
#sudo cp $GITHUB_WORKSPACE/travis/jdk/linux/64/Gama.ini $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64
cp -R jdk_linux/jdk $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64
#cp $GITHUB_WORKSPACE/travis/jdk/linux/64/Gama.ini $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64
echo "-vm" > Gama.ini
echo "./jdk/bin/java" >> Gama.ini
cat $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/Gama.ini >> Gama.ini
rm $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/Gama.ini
mv Gama.ini $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/Gama.ini
sudo cp $GITHUB_WORKSPACE/travis/jdk/linux/gama-headless.sh $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/headless
cp $GITHUB_WORKSPACE/travis/jdk/linux/gama-headless.sh $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64/headless




sudo cp -R jdk_win/jdk $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64
#sudo cp $GITHUB_WORKSPACE/travis/jdk/win/64/Gama.ini $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64
cp -R jdk_win/jdk $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64
#cp $GITHUB_WORKSPACE/travis/jdk/win/64/Gama.ini $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64
echo "-vm" > Gama.ini
echo "./jdk/bin/" >> Gama.ini
cat $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64/Gama.ini >> Gama.ini
rm $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64/Gama.ini
mv Gama.ini $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64/Gama.ini

sudo cp $GITHUB_WORKSPACE/travis/jdk/win/gama-headless.bat $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64/headless
cp $GITHUB_WORKSPACE/travis/jdk/win/gama-headless.bat $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64/headless







sudo cp -R jdk_osx/jdk $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64/Gama.app/Contents
#sudo cp $GITHUB_WORKSPACE/travis/jdk/mac/64/Gama.ini $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64/Gama.app/Contents/Eclipse
cp -R jdk_osx/jdk $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64/Gama.app/Contents
#cp $GITHUB_WORKSPACE/travis/jdk/mac/64/Gama.ini $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64/Gama.app/Contents/Eclipse
echo "-vm" > Gama.ini
echo "../jdk/Contents/Home/bin/java" >> Gama.ini
cat $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64/Gama.app/Contents/Eclipse/Gama.ini >> Gama.ini
rm $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64/Gama.app/Contents/Eclipse/Gama.ini
mv Gama.ini $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64/Gama.app/Contents/Eclipse/Gama.ini

sudo cp $GITHUB_WORKSPACE/travis/jdk/mac/gama-headless.sh $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64/Gama.app/Contents/headless
cp $GITHUB_WORKSPACE/travis/jdk/mac/gama-headless.sh $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64/Gama.app/Contents/headless





cd $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/linux/gtk/x86_64

sudo zip -9 -qyr "${RELEASEFILES[3]}" . && echo "compressed ${RELEASEFILES[3]}" || echo "compress fail ${RELEASEFILES[3]}"
zip -9 -qyr "${RELEASEFILES[3]}" . && echo "compressed ${RELEASEFILES[3]}" || echo "compress fail ${RELEASEFILES[3]}"

cd ../../../../../../../

Expand All @@ -173,7 +173,7 @@ cd ../../../../../../../

cd $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/win32/win32/x86_64

sudo zip -9 -qr "${RELEASEFILES[4]}" . && echo "compressed ${RELEASEFILES[4]}" || echo "compress fail ${RELEASEFILES[4]}"
zip -9 -qr "${RELEASEFILES[4]}" . && echo "compressed ${RELEASEFILES[4]}" || echo "compress fail ${RELEASEFILES[4]}"

cd ../../../../../../../

Expand All @@ -183,7 +183,7 @@ cd ../../../../../../../

cd $GITHUB_WORKSPACE/ummisco.gama.product/target/products/ummisco.gama.application.product/macosx/cocoa/x86_64

sudo zip -9 -qyr "${RELEASEFILES[5]}" . && echo "compressed ${RELEASEFILES[5]}" || echo "compress fail ${RELEASEFILES[5]}"
zip -9 -qyr "${RELEASEFILES[5]}" . && echo "compressed ${RELEASEFILES[5]}" || echo "compress fail ${RELEASEFILES[5]}"

cd ../../../../../../../

Expand Down
12 changes: 10 additions & 2 deletions ummisco.gama.annotations/pom.xml
View file
Expand Up @@ -19,10 +19,18 @@
<url>scp://51.255.46.42/./var/www/gama_updates/1.8.2</url>
</snapshotRepository>
</distributionManagement>

<pluginRepositories>
<pluginRepository>
<id>tycho-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
</pluginRepository>
</pluginRepositories>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.version>2.4.0</tycho.version>
<jdk.version>15</jdk.version>
<tycho.version>2.6.0-SNAPSHOT</tycho.version>
<jdk.version>17</jdk.version>
</properties>

<profiles>
Expand Down

0 comments on commit 2bb9b44

Please sign in to comment.