diff --git a/dev_support/ci_support/targetplatform/.project b/dev_support/ci_support/targetplatform/.project deleted file mode 100644 index 782c1ff2..00000000 --- a/dev_support/ci_support/targetplatform/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - targetplatform - - - - - - - - diff --git a/dev_support/ci_support/targetplatform/b3aggrtojson.py b/dev_support/ci_support/targetplatform/b3aggrtojson.py deleted file mode 100644 index a3fd7ac6..00000000 --- a/dev_support/ci_support/targetplatform/b3aggrtojson.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/env/python -import os,time,json,shutil -import glob -from xml.dom.minidom import parse, parseString -from os.path import basename - -SCRIPT_HOME=os.getcwd() - -def aggregator_to_map(directory): - sites = {} - for filename in glob.glob(directory + '/*.b3aggrcon'): - name = os.path.splitext(basename(filename))[0] - urls = [] - dom = parse(filename) - itemlist = dom.getElementsByTagName('repositories') - for item in itemlist: - url = item.attributes['location'].value - urls.append(url) - sites[name] = urls - return sites - -sites = aggregator_to_map('/home/cedric/src/org.eclipse.simrel.build') -print json.dumps(sites,sort_keys=True,indent=4, separators=(',', ': ')) diff --git a/dev_support/ci_support/targetplatform/configure_jenkinsgit4sparsecheckout.sh b/dev_support/ci_support/targetplatform/configure_jenkinsgit4sparsecheckout.sh deleted file mode 100644 index db5ffdc1..00000000 --- a/dev_support/ci_support/targetplatform/configure_jenkinsgit4sparsecheckout.sh +++ /dev/null @@ -1,6 +0,0 @@ -# configure git for sparse checkout so we can optimize diskusage (ie. checkout only required folders) -# simply add a call to this script from jenkins job -git config core.sparsecheckout true -echo "org/eclipse/gemoc/targetplatform" > .git/info/sparse-checkout -git read-tree -m -u HEAD -cd org/eclipse/gemoc/targetplatform \ No newline at end of file diff --git a/dev_support/ci_support/targetplatform/redirects.py b/dev_support/ci_support/targetplatform/redirects.py deleted file mode 100644 index 5f978633..00000000 --- a/dev_support/ci_support/targetplatform/redirects.py +++ /dev/null @@ -1,144 +0,0 @@ -#!/bin/env/python -import os,time,json,shutil,sys - -AGGREGATED_UPDATE='update' -MIRRORED_UPDATE='archive' -SCRIPT_HOME=os.getcwd() -sites = {} - - -def compute_repository_content(name,urls,timestamp): - compositeArtifacts = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n" % (name,timestamp,len(urls)) - compositeContent = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n" % (name,timestamp,len(urls)) - for url in urls: - compositeArtifacts +="\n" % url - compositeContent +="\n" % url - compositeArtifacts += "\n\ - \n" - compositeContent += "\n\ - \n" - return (compositeArtifacts,compositeContent) - -def produce_repository(name,urls,timestamp): - (compositeArtifacts,compositeContent) = compute_repository_content(name,urls,timestamp) - if not os.access(name,os.F_OK): - os.mkdir(name) - with open(name + '/compositeArtifacts.xml', 'w') as the_file: - the_file.write(compositeArtifacts) - with open(name + '/compositeContent.xml', 'w') as the_file: - the_file.write(compositeContent) - print "creating redirect : %s" % name - -def generate_redirects(sitejsonfile='sites.json'): - with open(sitejsonfile,'r') as json_file: - sites = json.load(json_file) - - print json.dumps(sites,sort_keys=True,indent=4, separators=(',', ': ')) - - if os.access(AGGREGATED_UPDATE,os.F_OK): - shutil.rmtree(AGGREGATED_UPDATE) - os.mkdir(AGGREGATED_UPDATE) - os.chdir(AGGREGATED_UPDATE) - - allurls = [] - timestamp = time.time() - for name,urls in sites.iteritems(): - allurls += urls - produce_repository(name,urls,timestamp) - - - for name,urls in sites.iteritems(): - produce_repository('all-except-' + name,set(allurls) - set(urls),timestamp) - - produce_repository(".",sites.keys(),timestamp) - - #now preparing for mirroring - - os.chdir('../') - if os.access(MIRRORED_UPDATE,os.F_OK): - shutil.rmtree(MIRRORED_UPDATE) - os.mkdir(MIRRORED_UPDATE) - os.chdir(MIRRORED_UPDATE) - - pomContent='\n\ - \n\ - 4.0.0\n\ - Mirroring\n\ - org.eclipse.gemoc.gemoc_studio\n\ - org.eclipse.gemoc.gemoc_studio.root\n\ - 1.0.0-SNAPSHOT\n\ - pom\n\ - \n\ - \n\ - 0.24.0\n\ - UTF-8\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - org.eclipse.tycho\n\ - tycho-maven-plugin\n\ - ${tycho-version}\n\ - true\n\ - \n\ - \n\ - org.eclipse.tycho.extras\n\ - tycho-p2-extras-plugin\n\ - ${tycho-version}\n\ - \n' - - for name,urls in sites.iteritems(): - if not os.access(name,os.F_OK): - os.mkdir(name) - pomContent +="\n\ - archive %s\n\ - package\n\ - \n\ - mirror\n\ - \n\ - \n\ - \n\ - \n\ - %s\n\ - \n\ - \n\ - true\n\ - %s\n\ - \n\ - \n" % (name,SCRIPT_HOME + "/" + AGGREGATED_UPDATE+ "/" + name,SCRIPT_HOME + "/" + MIRRORED_UPDATE+ "/" + name) - pomContent += " \n\ - \n\ - \n\ - \n\ - " - - with open('pom.xml', 'w') as the_file: - the_file.write(pomContent) - - for name,urls in sites.iteritems(): - produce_repository('all-except-' + name,set(map( lambda x : '../' + x,sites.keys())) - set(name),timestamp) - - produce_repository(".",sites.keys(),timestamp) - - -def main(argv): - if len(argv)==0: - generate_redirects() - if len(argv)==1: - generate_redirects(argv[0]) - -if __name__ == "__main__": - main(sys.argv[1:]) diff --git a/dev_support/ci_support/targetplatform/sites.json b/dev_support/ci_support/targetplatform/sites.json deleted file mode 100644 index 223c45dc..00000000 --- a/dev_support/ci_support/targetplatform/sites.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "platform": [ - "http://download.eclipse.org/mpc/neon", - "http://download.eclipse.org/releases/neon" - ], - "modeling-base": [ - "http://download.eclipse.org/modeling/mdt/ocl/updates/maintenance/4.1.2/M201401201522", - "http://download.eclipse.org/tools/gef/updates/milestones", - "http://download.eclipse.org/mmt/qvto/updates/releases/3.3.0" - ], - "acceleo": [ - "http://download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.4/R201309031307" - ], - "ecoretools": [ - "http://download.eclipse.org/ecoretools/updates/nightly/2.0.x/neon" - ], - "sirius": [ - "http://download.eclipse.org/sirius/updates/nightly/2.0.x/neon" - ], - "umldesigner": [ - "http://marketplace.obeonetwork.com/updates/nightly/uml/repository" - ], - "xtext": [ - "http://download.eclipse.org/modeling/emft/mwe/updates/releases/", - "http://download.eclipse.org/modeling/m2t/xpand/updates/releases/", - "http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.2/" - ], - "animation": [ - "https://ci.inria.fr/gemoc/job/fr.obeo.dsl.sirius.animation/lastSuccessfulBuild/artifact/fr/obeo/dsl/sirius/animation/releng/fr.obeo.dsl.debug.repository/target/repository/" - ], - "process": [ - "https://ci.inria.fr/gemoc/job/fr.obeo.dsl.process/lastSuccessfulBuild/artifact/fr/obeo/dsl/process/releng/fr.obeo.dsl.process.repository/target/repository/" - ], - "workspace": [ - "https://ci.inria.fr/gemoc/job/fr.obeo.dsl.workspace/lastSuccessfulBuild/artifact/fr/obeo/dsl/workspace/releng/fr.obeo.dsl.workspace.repository/target/repository/" - ], - "diverse-commons": [ - "https://ci.inria.fr/diverse-commons/job/diverse-commons.eclipse.root/lastSuccessfulBuild/artifact/commons-eclipse/fr.inria.diverse.commons.eclipse.root/p2updatesite/target/repository/" - ], - "timesquare": [ - "http://timesquare.inria.fr/update_site/neon" - ], - "moccml_mapping": [ - "https://ci.inria.fr/gemoc/job/MoCCML-mapping/lastSuccessfulBuild/artifact/moccml/mapping/deployment/org.eclipse.gemoc.moccml.mapping.updatesite/target/repository/" - ], - "gemoc-commons": [ - "https://ci.inria.fr/gemoc/job/org.eclipse.gemoc.gemoc_commons.root/lastSuccessfulBuild/artifact/org/eclipse/gemoc/gemoc_commons/org.eclipse.gemoc.commons.root/p2updatesite/target/repository/" - ], - "gemoc-language-workbench": [ - "https://ci.inria.fr/gemoc/job/org.eclipse.gemoc.gemoc_language_workbench.root/lastSuccessfulBuild/artifact/org/eclipse/gemoc/gemoc_language_workbench/org.eclipse.gemoc.gemoc_language_workbench.p2updatesite/target/repository" - ], - "gemoc-modeling-workbench": [ - "https://ci.inria.fr/gemoc/job/org.eclipse.gemoc.gemoc_modeling_workbench.root/lastSuccessfulBuild/artifact/org/eclipse/gemoc/gemoc_modeling_workbench/org.eclipse.gemoc.gemoc_modeling_workbench.p2updatesite/target/repository/" - ], - "gemoc-mocc": [ - "https://ci.inria.fr/gemoc/job/org.eclipse.gemoc.mocc.root/lastSuccessfulBuild/artifact/org/eclipse/gemoc/MoCC/releng/org.eclipse.gemoc.mocc.p2updatesite/target/repository/" - ], - "kermeta3": [ - "http://www.kermeta.org/k3/update/", - "https://ci.inria.fr/k3al/job/melange-production_stable/lastSuccessfulBuild/artifact/plugins/fr.inria.diverse.melange.p2updatesite/target/site/" - ], - "AspectJ": [ - "http://download.eclipse.org/tools/ajdt/44/dev/update" - ], - "devtools": [ - "http://community.polarion.com/projects/subversive/download/eclipse/4.0/luna-site/", - "http://download.eclipse.org/egit/updates", - "http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.7.0/N/0.7.0.201309291400/", - "http://sourceforge.net/projects/eclipse-cs/files/updatesite/5.7.0/" - ], - "groovy": [ - "http://dist.springsource.org/milestone/GRECLIPSE/e4.4/" - ], - "nebula": [ - "http://download.eclipse.org/technology/nebula/incubation/snapshot" - ] - -} diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.p2.inf b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.p2.inf index 7e480cf7..d1a61072 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.p2.inf +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.p2.inf @@ -1,26 +1,4 @@ instructions.configure=\ -addRepository(type:0,location:http${#58}//download.eclipse.org/releases/neon,name:Neon);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/releases/neon,name:Neon);\ -addRepository(type:0,location:http${#58}//timesquare.inria.fr/ecl/update_site/neon,name:Timesquare ECL);\ -addRepository(type:1,location:http${#58}//timesquare.inria.fr/ecl/update_site/neon,name:Timesquare ECL);\ -addRepository(type:0,location:http${#58}//timesquare.inria.fr/update_site/neon,name:Timesquare);\ -addRepository(type:1,location:http${#58}//timesquare.inria.fr/update_site/neon,name:Timesquare);\ -addRepository(type:0,location:http${#58}//melange-lang.org/updatesite/,name:Melange);\ -addRepository(type:1,location:http${#58}//melange-lang.org/updatesite/,name:Melange);\ -addRepository(type:0,location:http${#58}//gemoc.org/updatesite/studio_nightly/,name:All Gemoc components - nightly);\ -addRepository(type:1,location:http${#58}//gemoc.org/updatesite/studio_nightly/,name:All Gemoc components - nightly);\ -addRepository(type:0,location:https${#58}//hudson.polarsys.org/kitalpha/job/Kitalpha_Nightly/380/artifact/result/publish/kitalpha/site.p2/,name:KitAlpha);\ -addRepository(type:1,location:https${#58}//hudson.polarsys.org/kitalpha/job/Kitalpha_Nightly/380/artifact/result/publish/kitalpha/site.p2/,name:KitAlpha);\ -addRepository(type:0,location:http${#58}//download.eclipse.org/diffmerge/releases/0.4.0/emf-diffmerge-site,name:DiffMerge 0.4.0);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/diffmerge/releases/0.4.0/emf-diffmerge-site,name:DiffMerge 0.4.0);\ -addRepository(type:0,location:https${#58}//hudson.polarsys.org/capella/job/capella-gerrit/113/artifact/result/publish/org.polarsys.capella/site.p2/,name:Capella for luna);\ -addRepository(type:1,location:https${#58}//hudson.polarsys.org/capella/job/capella-gerrit/113/artifact/result/publish/org.polarsys.capella/site.p2/,name:Capella for luna);\ -addRepository(type:0,location:http${#58}//download.eclipse.org/technology/nebula/archives/Q42015/incubation,name:Nebula incubation);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/technology/nebula/archives/Q42015/incubation,name:Nebula incubation);\ -addRepository(type:0,location:http${#58}//gemoc.org/pub/studio/patch_sirius_palette/,name:Patch For Sirius (enabling animation));\ -addRepository(type:1,location:http${#58}//gemoc.org/pub/studio/patch_sirius_palette/,name:Patch For Sirius (enabling animation));\ -addRepository(type:0,location:http${#58}//dist.springsource.org/snapshot/GRECLIPSE/e4.5/,name:Greclipse);\ -addRepository(type:1,location:http${#58}//dist.springsource.org/snapshot/GRECLIPSE/e4.5/,name:Greclipse);\ mkdir(path:${installFolder}/dropins); requires.1.namespace=org.eclipse.equinox.p2.iu diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.product b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.product index 0106ad51..aa614c52 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.product +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.product @@ -48,14 +48,12 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 - @@ -79,9 +77,9 @@ - - + +