JooMDDeploy generates the aritfacts and content jar now.

thm-mni-ii · Mar 27, 2019 · 5e2ec1b · 5e2ec1b
1 parent 148a058
commit 5e2ec1b
Show file tree

Hide file tree

Showing 3 changed files with 335 additions and 14 deletions.
diff --git a/de.thm.icampus.joomdd.ejsl.parent/build.gradle b/de.thm.icampus.joomdd.ejsl.parent/build.gradle
@@ -492,15 +492,12 @@ task cleanEJSLUpdateSite(type: Delete){
 	delete('../updateSites/Eclipse/features/')
 	delete('../updateSites/Eclipse/plugins/')
 
-	//delete('../updateSites/Eclipse/content.jar')
-	//delete('../updateSites/Eclipse/artifacts.jar')
+	delete('../updateSites/Eclipse/content.jar')
+	delete('../updateSites/Eclipse/artifacts.jar')
 }
 
-
-
 ant.importBuild 'build.xml'
 
-
 task runAntBuild(dependsOn: "antBuildEclipse"){
 	description 'Runs build.xml Ant script for Eclipse Update Site'
 	group("JooMDD_Help_Task")
@@ -558,15 +555,64 @@ task createFeatureSDKJar(type: Jar) {
     from "./de.thm.icampus.joomdd.ejsl.sdk/feature.xml"
 }
 
-task createEclPluginToReleases(dependsOn:["copyEclPluginToReleasesTMP", "createPluginUIJar", "createFeatureSDKJar"]) {
-	description ''
-	group ('JooMDD_Help_Task')
-
-	createPluginUIJar.mustRunAfter copyEclPluginToReleasesTMP
-
-	doLast {
-		delete('../updateSites/tmp/')
-	}
+task createArtifactsXML(type: Copy) {
+    from '../eclipsePluginSkeletons/artifacts.xml'
+    into '../eclipsePluginSkeletons/tmp'
+
+    doLast {
+        def lastversion = getLastVersion();
+        def artifactsFile = file( '../eclipsePluginSkeletons/artifacts.xml' );
+        def contents = artifactsFile.getText( 'UTF-8' );
+        contents = contents.replaceAll( 'VersionPlaceholder', lastversion );
+        file("../eclipsePluginSkeletons/tmp/artifacts.xml").text = contents;
+    }
+}
+
+//create a single Jar with all dependencies
+task createArtifactsJar(type: Jar, dependsOn:["createArtifactsXML"]) {    
+    destinationDir = file( '../updateSites/Eclipse' )
+    archiveFileName = 'artifacts.jar'
+    from '../eclipsePluginSkeletons/tmp/artifacts.xml'
+
+    doLast {
+        delete('../eclipsePluginSkeletons/tmp/')
+    }
+} 
+
+task createContentXML(type: Copy) {
+    from '../eclipsePluginSkeletons/content.xml'
+    into '../eclipsePluginSkeletons/tmp'
+
+    doLast {
+        def lastversion = getLastVersion();
+        def artifactsFile = file( '../eclipsePluginSkeletons/content.xml' );
+        def contents = artifactsFile.getText( 'UTF-8' );
+        contents = contents.replaceAll( 'VersionPlaceholder', lastversion );
+        file("../eclipsePluginSkeletons/tmp/content.xml").text = contents;
+    }
+}
+
+//create a single Jar with all dependencies
+task createContentJar(type: Jar, dependsOn:["createContentXML"]) {    
+    destinationDir = file( '../updateSites/Eclipse' )
+    archiveFileName = 'content.jar'
+    from '../eclipsePluginSkeletons/tmp/content.xml'
+
+    doLast {
+        delete('../eclipsePluginSkeletons/tmp/')
+    }
+} 
+
+task createEclPluginToReleases(dependsOn:["copyEclPluginToReleasesTMP", "createPluginUIJar", "createFeatureSDKJar", "createArtifactsJar", "createContentJar"]) {
+    description ''
+    group ('JooMDD_Help_Task')
+
+    createPluginUIJar.mustRunAfter copyEclPluginToReleasesTMP
+
+    doLast {
+        delete('../updateSites/tmp/')
+        delete('../eclipsePluginSkeletons/tmp/')
+    }
 }
 
 task JooMDDDeployEclipse(dependsOn:["cleanEJSLUpdateSite","updateAllVersions","antBuildEclipse"]){

diff --git a/eclipsePluginSkeletons/artifacts.xml b/eclipsePluginSkeletons/artifacts.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?artifactRepository version='1.1.0'?>
+<repository name='Update Site' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
+  <properties size='2'>
+    <property name='p2.timestamp' value='1553689250161'/>
+    <property name='p2.compressed' value='true'/>
+  </properties>
+  <mappings size='3'>
+    <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
+    <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
+    <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
+  </mappings>
+  <artifacts size='4'>
+    <artifact classifier='osgi.bundle' id='de.thm.icampus.joomdd.ejsl.ui' version='VersionPlaceholder'>
+      <properties size='1'>
+        <property name='download.size' value='0'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='de.thm.icampus.joomdd.ejsl' version='VersionPlaceholder'>
+      <properties size='1'>
+        <property name='download.size' value='0'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='de.thm.icampus.joomdd.ejsl.ide' version='VersionPlaceholder'>
+      <properties size='1'>
+        <property name='download.size' value='0'/>
+      </properties>
+    </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='de.thm.icampus.joomdd.ejsl.sdk' version='VersionPlaceholder'>
+      <properties size='2'>
+        <property name='download.contentType' value='application/zip'/>
+        <property name='download.size' value='0'/>
+      </properties>
+    </artifact>
+  </artifacts>
+</repository>