Skip to content

[Eclipse] More Eclipse Build Cleanup #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 8, 2022
Merged

[Eclipse] More Eclipse Build Cleanup #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60079da
Use the latest Eclipse for the build
jeffgbutler Mar 7, 2022
1604349
Tycho consistently uses the target directory now
jeffgbutler Mar 7, 2022
1be33b6
Put all XML processing in the same Ant file
jeffgbutler Mar 7, 2022
615b5b4
Tabs!
jeffgbutler Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion eclipse/org.mybatis.generator.eclipse.site/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
/target/
/workspace/
16 changes: 3 additions & 13 deletions eclipse/org.mybatis.generator.eclipse.site/downloadMetadata.ant
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,22 @@
This file will download the existing P2 composite metadata so we can add our new
version.
The following environment properties are expected:

p2.repo.base.directory (the location of the local composite repo)

-->
<project name="project" default="download">
<target name="init">
<!-- Create repository directories if they don't already exist -->
<mkdir dir="${p2.repo.base.directory}"/>
</target>

<target name="download" depends="init">

<get dest="${p2.repo.base.directory}/compositeArtifacts.xml" ignoreerrors="true">
<url url="https://mybatis.jfrog.io/artifactory/generator-eclipse-release/compositeArtifacts.xml"/>
</get>

<get dest="${p2.repo.base.directory}/compositeContent.xml" ignoreerrors="true">
<url url="https://mybatis.jfrog.io/artifactory/generator-eclipse-release/compositeContent.xml"/>
</get>

<replaceregexp byline="true">
<regexp pattern="property name='p2.atomic.composite.loading' value='true'" />
<substitution expression="property name='p2.atomic.composite.loading' value='false'" />
<fileset dir="${p2.repo.base.directory}">
<include name="*.xml" />
</fileset>
</replaceregexp>
</target>
</project>
15 changes: 2 additions & 13 deletions eclipse/org.mybatis.generator.eclipse.site/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,6 @@
<finalName>${project.artifactId}-${qualifiedVersion}</finalName>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>workspace</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -95,9 +84,9 @@
<configuration>
<repositories>
<repository>
<id>Oldest Version Supporting Java 11</id>
<id>Eclipse Latest</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/2018-12</url>
<url>http://download.eclipse.org/releases/latest</url>
</repository>
</repositories>
<dependencies>
Expand Down
27 changes: 18 additions & 9 deletions eclipse/org.mybatis.generator.eclipse.site/updateP2CompositeRepo.ant
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<target name="init">
<property name="repo.drops.dir" value="${p2.repo.base.directory}/drops"/>
<property name="repo.zipped.dir" value="${p2.repo.base.directory}/zipped"/>

<!-- Create repository directories if they don't already exist -->
<mkdir dir="${p2.repo.base.directory}"/>
<mkdir dir="${repo.drops.dir}"/>
Expand All @@ -52,6 +52,15 @@
<fileset dir="${project.build.directory}/repository"/>
</copy>

<!-- turn off composite loading so we don't download all the old versions -->
<replaceregexp byline="true">
<regexp pattern="property name='p2.atomic.composite.loading' value='true'" />
<substitution expression="property name='p2.atomic.composite.loading' value='false'" />
<fileset dir="${p2.repo.base.directory}">
<include name="*.xml" />
</fileset>
</replaceregexp>

<!-- update composite repo (this task needs to run in the Eclipse runtime) -->
<p2.composite.repository>
<repository compressed="false" location="${p2.repo.base.directory}"/>
Expand All @@ -69,11 +78,11 @@
<include name="*.xml" />
</fileset>
</replaceregexp>
<!-- setup the shebang and variables -->
<echo message="#!/bin/bash${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" />
<echo message="USER=xxxx${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" append="true" />
<echo message="API_KEY=xxxx${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" append="true" />

<!-- setup the shebang and variables -->
<echo message="#!/bin/bash${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" />
<echo message="USER=xxxx${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" append="true" />
<echo message="API_KEY=xxxx${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" append="true" />

<!-- generate the jfrog upload script -->
<!-- Write curl lines for every file we need to upload -->
Expand All @@ -82,17 +91,17 @@
<srcfile />
<arg value="-u$USER:$API_KEY"/>
<targetfile/>

<fileset dir="${p2.repo.base.directory}" >
<include name="drops/**/*.*"/>
<include name="*.xml"/>
<include name="zipped/${project.artifactId}-${qualifiedVersion}.zip"/>
</fileset>
<globmapper from="*" to="&quot;https://mybatis.jfrog.io/artifactory/generator-eclipse-release/*&quot;" />
</apply>

<!-- make it executable -->
<chmod perm="+x" file="${p2.repo.base.directory}/jfrogUpload.sh"/>

</target>
</project>