Skip to content

Commit

Permalink
111: Deploy to GitHub Pages
Browse files Browse the repository at this point in the history 
Task-Url: #111
  • Loading branch information
@LorenzoBettini
LorenzoBettini committed May 4, 2021
1 parent 3ba045c commit ac9d359
Show file tree
Hide file tree
Showing 20 changed files with 389 additions and 335 deletions.
124 changes: 88 additions & 36 deletions javamm.parent/ant/packaging-p2composite.ant
View file
@@ -1,66 +1,118 @@
<?xml version="1.0"?>
<project name="project">

<target name="getMajorMinorVersion">
<script language="javascript">
<![CDATA[
// getting the value
buildnumber = project.getProperty("unqualifiedVersion");
index = buildnumber.lastIndexOf(".");
counter = buildnumber.substring(0, index);
project.setProperty("majorMinorVersion",counter);
]]>
</script>
</target>

<target name="test_getMajorMinor" depends="getMajorMinorVersion">
<echo message="majorMinorVersion: ${majorMinorVersion}" />
</target>
<!--
The idea is to have this directory layout:
.
├── compositeArtifacts.xml
├── compositeContent.xml
├── p2.index
├── README.md
├── releases
│   ├── 1.0.0.v20210307-2037
│   │   ├── artifacts.jar
│   │   ├── ...
│   │   ├── features ...
│   │   └── plugins ...
│   ├── 1.0.0.v20210307-2046 ...
│   ├── 1.1.0.v20210307-2104 ...
│   └── 2.0.0.v20210308-1304 ...
└── updates
├── 1.x
│   ├── 1.0.x
│   │   ├── compositeArtifacts.xml
│   │   ├── compositeContent.xml
│   │   └── p2.index
│   ├── 1.1.x
│   │   ├── compositeArtifacts.xml
│   │   ├── compositeContent.xml
│   │   └── p2.index
│   ├── compositeArtifacts.xml
│   ├── compositeContent.xml
│   └── p2.index
└── 2.x
├── 2.0.x
│   ├── compositeArtifacts.xml
│   ├── compositeContent.xml
│   └── p2.index
├── compositeArtifacts.xml
├── compositeContent.xml
└── p2.index
-->

<!--
site.label The name/title/label of the created composite site
parsedVersion.majorVersion
parsedVersion.minorVersion
are expected to be provided
(see the POM and the use of build-helper-maven-plugin
unqualifiedVersion The version without any qualifier replacement
buildQualifier The build qualifier
child.repository.path.prefix The path prefix to access the actual p2 repo from the
child repo, e.g., if child repo is in /updates/1.0 and
the p2 repo is in /releases/1.0.0.something then this property
should be "../../releases/"
composite.base.dir The directory of the main composite (default "target")
updates.path The directory of composite children
default is "updates"
updates.suffix The suffix to append to updates versions directories
(default ".x", e.g., "1.x", "2.1.x")
releases.path.prefix The path prefix to access the actual p2 releases repo from the
composite updates repo, e.g., if the directory of composite children
is "updates" and the releases main directory is "releases"
then this property should be "../../../releases" (the default)
child.repo An external repository to be added as a child
-->
<target name="compute.child.repository.data" depends="getMajorMinorVersion">
<target name="compute.child.repository.data">
<property name="full.version" value="${unqualifiedVersion}.${buildQualifier}" />

<property name="site.composite.name" value="${site.label} ${majorMinorVersion}" />
<property name="main.site.composite.name" value="${site.label} All Versions" />
<property name="updates.suffix" value=".x"/>
<property name="main.site.composite.name"
value="${site.label} All Versions" />
<property name="child1.site.composite.name"
value="${site.label} ${parsedVersion.majorVersion}${updates.suffix}" />
<property name="child2.site.composite.name"
value="${site.label} ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}${updates.suffix}" />

<!-- composite.base.dir The base directory for the local composite metadata,
e.g., from Maven, ${project.build.directory}
-->
<property name="composite.base.dir" value="target"/>

<property name="main.composite.repository.directory" location="${composite.base.dir}/composite-main" />
<property name="composite.repository.directory" location="${composite.base.dir}/composite-child" />

<property name="child.repository" value="${child.repository.path.prefix}${full.version}" />
<property name="updates.path" value="updates"/>
<property name="releases.path.prefix" value="../../../releases"/>


<property name="main.site.composite.directory"
location="${composite.base.dir}" />
<property name="child1.site.composite.path"
value="${updates.path}/${parsedVersion.majorVersion}${updates.suffix}" />
<property name="child1.site.composite.directory"
location="${composite.base.dir}/${child1.site.composite.path}" />
<property name="child2.site.composite.path"
value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}${updates.suffix}" />
<property name="child2.site.composite.directory"
location="${composite.base.dir}/${child1.site.composite.path}/${child2.site.composite.path}" />

<property name="release.repository"
value="${releases.path.prefix}/${full.version}" />
</target>

<target name="p2.composite.add" depends="compute.child.repository.data">
<add.composite.repository.internal
composite.repository.location="${main.composite.repository.directory}"
composite.repository.location="${main.site.composite.directory}"
composite.repository.name="${main.site.composite.name}"
composite.repository.child="${majorMinorVersion}" />
composite.repository.child="${child1.site.composite.path}" />
<add.composite.repository.internal
composite.repository.location="${child1.site.composite.directory}"
composite.repository.name="${child1.site.composite.name}"
composite.repository.child="${child2.site.composite.path}" />
<add.composite.repository.internal
composite.repository.location="${composite.repository.directory}"
composite.repository.name="${site.composite.name}"
composite.repository.child="${child.repository}" />
composite.repository.location="${child2.site.composite.directory}"
composite.repository.name="${child2.site.composite.name}"
composite.repository.child="${release.repository}" />
</target>

<target name="p2.composite.add.external" depends="compute.child.repository.data">
<add.external.repository.internal
composite.repository.location="${composite.repository.directory}"
composite.repository.name="${site.composite.name}"
composite.repository.location="${child2.site.composite.directory}"
composite.repository.name="${child2.site.composite.name}"
composite.repository.child="${child.repo}" />
</target>

Expand Down
0 javamm.parent/aggregator/b3.ant → javamm.parent/old-stuff/aggregator/b3.ant
View file
File renamed without changes.
0 ...gator/luna-xtext-2.7-swtbot-mirror.b3aggr → ...gator/luna-xtext-2.7-swtbot-mirror.b3aggr
View file
File renamed without changes.
0 ...gator/luna-xtext-2.8-swtbot-mirror.b3aggr → ...gator/luna-xtext-2.8-swtbot-mirror.b3aggr
View file
File renamed without changes.
0 ...gator/mars-xtext-2.8-swtbot-mirror.b3aggr → ...gator/mars-xtext-2.8-swtbot-mirror.b3aggr
View file
File renamed without changes.
0 ...gator/mars-xtext-2.9-swtbot-mirror.b3aggr → ...gator/mars-xtext-2.9-swtbot-mirror.b3aggr
View file
File renamed without changes.
0 javamm.parent/ant/bintray.ant → javamm.parent/old-stuff/bintray.ant
View file
File renamed without changes.
0 javamm.parent/findbugs/excludeFilter.xml → ...rent/old-stuff/findbugs/excludeFilter.xml
View file
File renamed without changes.
0 javamm.parent/old-ant/old-pom.properties.txt → .../old-stuff/old-ant/old-pom.properties.txt
View file
File renamed without changes.
0 ....parent/old-ant/packaging-p2composite.ant → ...d-stuff/old-ant/packaging-p2composite.ant
View file
File renamed without changes.
129 changes: 129 additions & 0 deletions javamm.parent/old-stuff/packaging-p2composite.ant
View file
@@ -0,0 +1,129 @@
<?xml version="1.0"?>
<project name="project">

<target name="getMajorMinorVersion">
<script language="javascript">
<![CDATA[
// getting the value
buildnumber = project.getProperty("unqualifiedVersion");
index = buildnumber.lastIndexOf(".");
counter = buildnumber.substring(0, index);
project.setProperty("majorMinorVersion",counter);
]]>
</script>
</target>

<target name="test_getMajorMinor" depends="getMajorMinorVersion">
<echo message="majorMinorVersion: ${majorMinorVersion}" />
</target>

<!--
site.label The name/title/label of the created composite site
unqualifiedVersion The version without any qualifier replacement
buildQualifier The build qualifier
child.repository.path.prefix The path prefix to access the actual p2 repo from the
child repo, e.g., if child repo is in /updates/1.0 and
the p2 repo is in /releases/1.0.0.something then this property
should be "../../releases/"
child.repo An external repository to be added as a child
-->
<target name="compute.child.repository.data" depends="getMajorMinorVersion">
<property name="full.version" value="${unqualifiedVersion}.${buildQualifier}" />

<property name="site.composite.name" value="${site.label} ${majorMinorVersion}" />
<property name="main.site.composite.name" value="${site.label} All Versions" />

<!-- composite.base.dir The base directory for the local composite metadata,
e.g., from Maven, ${project.build.directory}
-->
<property name="composite.base.dir" value="target"/>

<property name="main.composite.repository.directory" location="${composite.base.dir}/composite-main" />
<property name="composite.repository.directory" location="${composite.base.dir}/composite-child" />

<property name="child.repository" value="${child.repository.path.prefix}${full.version}" />
</target>

<target name="p2.composite.add" depends="compute.child.repository.data">
<add.composite.repository.internal
composite.repository.location="${main.composite.repository.directory}"
composite.repository.name="${main.site.composite.name}"
composite.repository.child="${majorMinorVersion}" />
<add.composite.repository.internal
composite.repository.location="${composite.repository.directory}"
composite.repository.name="${site.composite.name}"
composite.repository.child="${child.repository}" />
</target>

<target name="p2.composite.add.external" depends="compute.child.repository.data">
<add.external.repository.internal
composite.repository.location="${composite.repository.directory}"
composite.repository.name="${site.composite.name}"
composite.repository.child="${child.repo}" />
</target>

<!-- = = = = = = = = = = = = = = = = =
macrodef: add.composite.repository.internal
= = = = = = = = = = = = = = = = = -->
<macrodef name="add.composite.repository.internal">
<attribute name="composite.repository.location" />
<attribute name="composite.repository.name" />
<attribute name="composite.repository.child" />
<sequential>

<echo message=" " />
<echo message="Composite repository : @{composite.repository.location}" />
<echo message="Composite name : @{composite.repository.name}" />
<echo message="Adding child repository : @{composite.repository.child}" />

<p2.composite.repository>
<repository
compressed="false"
location="@{composite.repository.location}"
name="@{composite.repository.name}"
atomic="false" />
<add>
<repository location="@{composite.repository.child}" />
</add>
</p2.composite.repository>

<echo file="@{composite.repository.location}/p2.index">version=1
metadata.repository.factory.order=compositeContent.xml,\!
artifact.repository.factory.order=compositeArtifacts.xml,\!
</echo>

</sequential>
</macrodef>

<!-- = = = = = = = = = = = = = = = = =
macrodef: add.external.repository.internal
= = = = = = = = = = = = = = = = = -->
<macrodef name="add.external.repository.internal">
<attribute name="composite.repository.location" />
<attribute name="composite.repository.name" />
<attribute name="composite.repository.child" />
<sequential>

<echo message=" " />
<echo message="Composite repository : @{composite.repository.location}" />
<echo message="Composite name : @{composite.repository.name}" />
<echo message="Adding child repository : @{composite.repository.child}" />

<p2.composite.repository>
<repository
compressed="false"
location="@{composite.repository.location}"
name="@{composite.repository.name}"
atomic="false" />
<add>
<repository location="@{composite.repository.child}" />
</add>
</p2.composite.repository>

</sequential>
</macrodef>


</project>
0 ...t/release/jenkins-javamm-copy-products.sh → ...f/release/jenkins-javamm-copy-products.sh
View file
File renamed without changes.
0 ...ase/jenkins-sync-javamm-updates-commit.sh → ...ase/jenkins-sync-javamm-updates-commit.sh
View file
File renamed without changes.
0 ...ase/jenkins-sync-javamm-updates-update.sh → ...ase/jenkins-sync-javamm-updates-update.sh
View file
File renamed without changes.
0 javamm.parent/tools/removeFromBintray.sh → javamm.parent/old-stuff/removeFromBintray.sh
View file
File renamed without changes.
0 javamm.parent/tools/removeFromBintrayPath.sh → ...parent/old-stuff/removeFromBintrayPath.sh
View file
File renamed without changes.
0 javamm.parent/tools/update-versions.txt → javamm.parent/old-stuff/update-versions.txt
View file
File renamed without changes.

0 comments on commit ac9d359

Please sign in to comment.