Merge branch 'fixes'

Conflicts:
	com.minres.products.setup
	projects/JIT-ISS-CoreDsl.setup
	projects/Mendel.setup
	projects/Structural.setup
This commit is contained in:
Eyck Jentzsch 2019-12-05 17:12:42 +01:00
commit 635e2c227a
8 changed files with 74 additions and 509 deletions

View File

@ -6,35 +6,35 @@
name="index" name="index"
label="index"> label="index">
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/ProjectSet.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/ProjectSet.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Resources.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Resources.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Targlets.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Targlets.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Workbench.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Workbench.ecore#/"/>
<discoverablePackage <discoverablePackage
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore#/"/>
<productCatalog <productCatalog
href="com.minres.products.setup#/"/> href="com.minres.products.setup#/"/>
<projectCatalog <projectCatalog
@ -43,19 +43,19 @@
<productCatalog <productCatalog
href="catalog:/self-product-catalog.setup#/"/> href="catalog:/self-product-catalog.setup#/"/>
<productCatalog <productCatalog
href="user-ext:/user.products.setup?class='http://www.eclipse.org/oomph/setup/1.0%23//ProductCatalog',name='user.products',label='%3CUser%20Products%3E',description='A%20container%20catalog%20for%20local%20user-defined%20products'#/"/> href="user-ext:/user.products.setup?class='https://www.eclipse.org/oomph/setup/1.0%23//ProductCatalog',name='user.products',label='%3CUser%20Products%3E',description='A%20container%20catalog%20for%20local%20user-defined%20products'#/"/>
<productCatalog <productCatalog
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.products.setup#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.products.setup#/"/>
<productCatalog <productCatalog
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.applications.setup#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.applications.setup#/"/>
<productCatalog <productCatalog
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/redirectable.products.setup#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/redirectable.products.setup#/"/>
<projectCatalog <projectCatalog
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.projects.setup#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/org.eclipse.projects.setup#/"/>
<projectCatalog <projectCatalog
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/com.github.projects.setup#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/com.github.projects.setup#/"/>
<projectCatalog <projectCatalog
href="https://raw.githubusercontent.com/vorburger/opendaylight-eclipse-setup/master/org.opendaylight.projects.setup#/"/> href="https://raw.githubusercontent.com/vorburger/opendaylight-eclipse-setup/master/org.opendaylight.projects.setup#/"/>
<projectCatalog <projectCatalog
href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/redirectable.projects.setup#/"/> href="https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/redirectable.projects.setup#/"/>
</setup:Index> </setup:Index>

View File

@ -8,125 +8,22 @@
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore" xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore"
name="DBT-RISE-RISCV" name="RISCV-VP"
label="DBT-RISE RISCV"> label="RISCV-VP">
<setupTask <setupTask
xsi:type="setup:CompoundTask" xsi:type="setup:CompoundTask"
name="Global Variables"> name="Global Variables">
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="github.user.id" name="git.user.id"
defaultValue="anonymous" defaultValue="anonymous"
label="Github user ID"> label="User ID">
<description>The user ID of the Github account</description> <description>The user ID of the MINRES account</description>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="github.author.name" name="git.stream"
label="Github author name"> defaultValue="master"
<description>The author name used for Github commits</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="github.author.email"
label="Github author email">
<description>The email address associated with Github commits</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
type="PASSWORD"
name="github.user.password"
label="Github password for issues">
<annotation
source="http://www.eclipse.org/oomph/setup/PasswordVerificationDisabled">
<detail
key="type">
<value>form</value>
</detail>
<detail
key="form.url">
<value>https://github.com/session</value>
</detail>
<detail
key="form.cookie">
<value>PHPSESSID</value>
</detail>
<detail
key="form.parameters">
<value>login password authenticity_token utf8 commit</value>
</detail>
<detail
key="form.secure.parameters">
<value>password</value>
</detail>
<detail
key="form.filter">
<value>login=anonymous\&amp;.*</value>
</detail>
<detail
key="form.parameter.login">
<value>$${github.user.id}</value>
</detail>
<detail
key="form.parameter.password">
<value>$${value}</value>
</detail>
<detail
key="form.parameter.utf8">
<value>✓</value>
</detail>
<detail
key="form.parameter.commit">
<value>Sign in</value>
</detail>
<detail
key="form.ok">
<value>Valid password for $${form.parameter.login} at $${form.url}.</value>
</detail>
<detail
key="form.info">
<value>
Validate the password for $${form.parameter.login} at
$${form.url}.
</value>
</detail>
<detail
key="form.warning">
<value>
Unable to validate the password for $${form.parameter.login}
because $${form.url} is unreachable.
</value>
</detail>
<detail
key="form.error">
<value>
Invalid password for $${form.parameter.login} at
$${form.url}.
</value>
</detail>
</annotation>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="github.remoteURIs"
label="Github repository">
<choice
value="git@github.com:@{remoteURI}.git"
label="Git (read-write)"/>
<choice
value="https://${github.user.id|username}@github.com/@{remoteURI}.git"
label="HTTPS (read-write)">
<annotation
source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
</choice>
<choice
value="https://github.com/@{remoteURI}.git"
label="HTTPS (read-only, anonymous)"/>
<description>Choose from the available Github URIs</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="git-stream"
label="Stream to checkout"> label="Stream to checkout">
<choice <choice
value="master"/> value="master"/>
@ -168,31 +65,17 @@
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="git:GitCloneTask" xsi:type="git:GitCloneTask"
id="git.clone.dbt_rise_riscv" id="git.clone.riscv_vp"
remoteURI="Minres/DBT-RISE-RISCV"> remoteURI="https://${git.user.id}@git.minres.com/VP/RISCV-VP.git"
<annotation recursive="true">
source="http://www.eclipse.org/oomph/setup/InducedChoices">
<detail
key="inherit">
<value>github.remoteURIs</value>
</detail>
<detail
key="label">
<value>${scope.project.label} Git repository</value>
</detail>
<detail
key="target">
<value>remoteURI</value>
</detail>
</annotation>
<description>${scope.project.label}</description> <description>${scope.project.label}</description>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="projects:ProjectsImportTask"> xsi:type="projects:ProjectsImportTask">
<sourceLocator <sourceLocator
rootFolder="${git.clone.dbt_rise_riscv.location}"/> rootFolder="${git.clone.riscv_vp.location}"/>
</setupTask> </setupTask>
<stream name="${git-stream}" <stream name="${git.stream}"
label="Stream to checkout"/> label="Stream to checkout"/>
<description>An instruction set simulator based on DBT-RISE implementing the RISC-V ISA.</description> <description>An instruction set simulator based on DBT-RISE implementing the RISC-V ISA.</description>
</setup:Project> </setup:Project>

View File

@ -19,14 +19,15 @@
name="Global Variables"> name="Global Variables">
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="minres.git.user.id" name="git.user.id"
defaultValue="anonymous" defaultValue="anonymous"
label="User ID"> label="User ID">
<description>The user ID of the MINRES account</description> <description>The user ID of the MINRES account</description>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="minres-git-stream" name="git.stream"
defaultValue="master"
label="Stream to checkout"> label="Stream to checkout">
<choice <choice
value="master"/> value="master"/>
@ -75,7 +76,7 @@
xsi:type="git:GitCloneTask" xsi:type="git:GitCloneTask"
id="git.clone.CoreDsl" id="git.clone.CoreDsl"
filter="" filter=""
remoteURI="https://${minres.git.user.id}@git.minres.com/DBT-RISE/CoreDSL.git"> remoteURI="https://${git.user.id}@git.minres.com/DBT-RISE/CoreDSL.git">
<description>${scope.project.label}</description> <description>${scope.project.label}</description>
</setupTask> </setupTask>
<setupTask <setupTask
@ -102,7 +103,7 @@
name="com.minres.coredsl.target"> name="com.minres.coredsl.target">
<description>Sets the CoreDSL target platform</description> <description>Sets the CoreDSL target platform</description>
</setupTask> </setupTask>
<stream name="${minres-git-stream}" <stream name="${git.stream}"
label="Stream to checkout"/> label="Stream to checkout"/>
<description>A Xtext based CoreDSL editor with syntax highlighting and context sensitive help.</description> <description>A Xtext based CoreDSL editor with syntax highlighting and context sensitive help.</description>
</setup:Project> </setup:Project>

View File

@ -19,14 +19,14 @@
name="Global Variables"> name="Global Variables">
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="minres.git.user.id" name="git.user.id"
defaultValue="" defaultValue=""
label="User ID"> label="User ID">
<description>The user ID of the MINRES account</description> <description>The user ID of the MINRES account</description>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="minres-git-stream" name="git.stream"
label="Stream to checkout"> label="Stream to checkout">
<choice <choice
value="master"/> value="master"/>
@ -89,7 +89,7 @@
xsi:type="git:GitCloneTask" xsi:type="git:GitCloneTask"
id="git.clone.mendel" id="git.clone.mendel"
filter="" filter=""
remoteURI="https://${minres.git.user.id}@git.minres.com/Mendel/mendel.git"> remoteURI="https://${git.user.id}@git.minres.com/Mendel/mendel.git">
<description>${scope.project.label}</description> <description>${scope.project.label}</description>
</setupTask> </setupTask>
<setupTask <setupTask
@ -188,7 +188,7 @@
</workingSet> </workingSet>
<description>The dynamic working sets for ${scope.project.label}</description> <description>The dynamic working sets for ${scope.project.label}</description>
</setupTask> </setupTask>
<stream name="${minres-git-stream}" <stream name="${git.stream}"
label="Stream to checkout"> label="Stream to checkout">
<description></description> <description></description>
</stream> </stream>

View File

@ -19,109 +19,15 @@
name="Global Variables"> name="Global Variables">
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="github.user.id" name="git.user.id"
defaultValue="anonymous" defaultValue="anonymous"
label="Github user ID"> label="User ID">
<description>The user ID of the Github account</description> <description>The user ID of the MINRES account</description>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="github.author.name" name="git.stream"
label="Github author name"> defaultValue="master"
<description>The author name used for Github commits</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="github.author.email"
label="Github author email">
<description>The email address associated with Github commits</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
type="PASSWORD"
name="github.user.password"
label="Github password for issues">
<annotation
source="http://www.eclipse.org/oomph/setup/PasswordVerificationDisabled">
<detail
key="type">
<value>form</value>
</detail>
<detail
key="form.url">
<value>https://github.com/session</value>
</detail>
<detail
key="form.cookie">
<value>PHPSESSID</value>
</detail>
<detail
key="form.parameters">
<value>login password authenticity_token utf8 commit</value>
</detail>
<detail
key="form.secure.parameters">
<value>password</value>
</detail>
<detail
key="form.filter">
<value>login=anonymous\&amp;.*</value>
</detail>
<detail
key="form.parameter.login">
<value>$${github.user.id}</value>
</detail>
<detail
key="form.parameter.password">
<value>$${value}</value>
</detail>
<detail
key="form.parameter.utf8">
<value>✓</value>
</detail>
<detail
key="form.parameter.commit">
<value>Sign in</value>
</detail>
<detail
key="form.ok">
<value>Valid password for $${form.parameter.login} at $${form.url}.</value>
</detail>
<detail
key="form.info">
<value>Validate the password for $${form.parameter.login} at $${form.url}.</value>
</detail>
<detail
key="form.warning">
<value>Unable to validate the password for $${form.parameter.login} because $${form.url} is unreachable.</value>
</detail>
<detail
key="form.error">
<value>Invalid password for $${form.parameter.login} at $${form.url}.</value>
</detail>
</annotation>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="github.remoteURIs"
label="Github repository">
<choice
value="git@github.com:@{remoteURI}.git"
label="Git (read-write)"/>
<choice
value="https://${github.user.id|username}@github.com/@{remoteURI}.git"
label="HTTPS (read-write)">
<annotation
source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
</choice>
<choice
value="https://github.com/@{remoteURI}.git"
label="HTTPS (read-only, anonymous)"/>
<description>Choose from the available Github URIs</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="git-stream"
label="Stream to checkout"> label="Stream to checkout">
<choice <choice
value="master"/> value="master"/>
@ -170,22 +76,7 @@
xsi:type="git:GitCloneTask" xsi:type="git:GitCloneTask"
id="git.clone.RDL_Editor" id="git.clone.RDL_Editor"
filter="" filter=""
remoteURI="Minres/RDL-Editor"> remoteURI="https://${git.user.id}@git.minres.com/VP-Tools/RDL-Editor.git">
<annotation
source="http://www.eclipse.org/oomph/setup/InducedChoices">
<detail
key="inherit">
<value>github.remoteURIs</value>
</detail>
<detail
key="label">
<value>${scope.project.label} Git repository</value>
</detail>
<detail
key="target">
<value>remoteURI</value>
</detail>
</annotation>
<description>${scope.project.label}</description> <description>${scope.project.label}</description>
</setupTask> </setupTask>
<setupTask <setupTask
@ -212,7 +103,7 @@
name="com.minres.rdl.target"> name="com.minres.rdl.target">
<description>Sets the RDL Editor target platform</description> <description>Sets the RDL Editor target platform</description>
</setupTask> </setupTask>
<stream name="${git-stream}" <stream name="${git.stream}"
label="Stream to checkout"/> label="Stream to checkout"/>
<description>A Xtext based SystemRDL editor with syntax highlighting and context sensitive help.</description> <description>A Xtext based SystemRDL editor with syntax highlighting and context sensitive help.</description>
</setup:Project> </setup:Project>

View File

@ -19,110 +19,15 @@
name="Global Variables"> name="Global Variables">
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="github.user.id" name="git.user.id"
defaultValue="anonymous" defaultValue="anonymous"
label="Github user ID"> label="User ID">
<description>The user ID of the Github account</description> <description>The user ID of the MINRES account</description>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="github.author.name" name="git.stream"
label="Github author name"> defaultValue="master"
<description>The author name used for Github commits</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="github.author.email"
label="Github author email">
<description>The email address associated with Github commits</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
type="PASSWORD"
name="github.user.password"
label="Github password for issues">
<annotation
source="http://www.eclipse.org/oomph/setup/PasswordVerificationDisabled">
<detail
key="type">
<value>form</value>
</detail>
<detail
key="form.url">
<value>https://github.com/session</value>
</detail>
<detail
key="form.cookie">
<value>PHPSESSID</value>
</detail>
<detail
key="form.parameters">
<value>login password authenticity_token utf8 commit</value>
</detail>
<detail
key="form.secure.parameters">
<value>password</value>
</detail>
<detail
key="form.filter">
<value>login=anonymous\&amp;.*</value>
</detail>
<detail
key="form.parameter.login">
<value>$${github.user.id}</value>
</detail>
<detail
key="form.parameter.password">
<value>$${value}</value>
</detail>
<detail
key="form.parameter.utf8">
<value>✓</value>
</detail>
<detail
key="form.parameter.commit">
<value>Sign in</value>
</detail>
<detail
key="form.ok">
<value>Valid password for $${form.parameter.login} at $${form.url}.</value>
</detail>
<detail
key="form.info">
<value>Validate the password for $${form.parameter.login} at $${form.url}.</value>
</detail>
<detail
key="form.warning">
<value>Unable to validate the password for $${form.parameter.login} because $${form.url} is unreachable.</value>
</detail>
<detail
key="form.error">
<value>Invalid password for $${form.parameter.login} at $${form.url}.</value>
</detail>
</annotation>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="github.remoteURIs"
value=""
label="Github repository">
<choice
value="git@github.com:@{remoteURI}.git"
label="Git (read-write)"/>
<choice
value="https://${github.user.id|username}@github.com/@{remoteURI}.git"
label="HTTPS (read-write)">
<annotation
source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
</choice>
<choice
value="https://github.com/@{remoteURI}.git"
label="HTTPS (read-only, anonymous)"/>
<description>Choose from the available Github URIs</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="git-stream"
label="Stream to checkout"> label="Stream to checkout">
<choice <choice
value="master"/> value="master"/>
@ -170,22 +75,7 @@
xsi:type="git:GitCloneTask" xsi:type="git:GitCloneTask"
id="git.clone.SCViewer" id="git.clone.SCViewer"
filter="" filter=""
remoteURI="Minres/SCViewer"> remoteURI="https://${git.user.id}@git.minres.com/VP-Tools/SCViewer.git">
<annotation
source="http://www.eclipse.org/oomph/setup/InducedChoices">
<detail
key="inherit">
<value>github.remoteURIs</value>
</detail>
<detail
key="label">
<value>${scope.project.label} Git repository</value>
</detail>
<detail
key="target">
<value>remoteURI</value>
</detail>
</annotation>
<description>${scope.project.label}</description> <description>${scope.project.label}</description>
</setupTask> </setupTask>
<setupTask <setupTask
@ -212,7 +102,7 @@
name="Neon Platform"> name="Neon Platform">
<description>Sets the RDL Editor target platform</description> <description>Sets the RDL Editor target platform</description>
</setupTask> </setupTask>
<stream name="${git-stream}" <stream name="${git.stream}"
label="Stream to checkout"/> label="Stream to checkout"/>
<description>A lightweight tool to visualize VCD and transaction traces.</description> <description>A lightweight tool to visualize VCD and transaction traces.</description>
</setup:Project> </setup:Project>

View File

@ -19,14 +19,14 @@
name="Global Variables"> name="Global Variables">
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="minres.git.user.id" name="git.user.id"
defaultValue="anonymous" defaultValue="anonymous"
label="User ID"> label="User ID">
<description>The user ID of the MINRES account</description> <description>The user ID of the MINRES account</description>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="minres-git-stream" name="git.stream"
label="Stream to checkout"> label="Stream to checkout">
<choice <choice
value="master"/> value="master"/>
@ -79,7 +79,7 @@
xsi:type="git:GitCloneTask" xsi:type="git:GitCloneTask"
id="git.clone.Structural" id="git.clone.Structural"
filter="" filter=""
remoteURI="https://${minres.git.user.id}@git.minres.com/VP/Structural.git" remoteURI="https://${git.user.id}@git.minres.com/VP-Tools/Structural.git"
pushURI=""> pushURI="">
<description>${scope.project.label}</description> <description>${scope.project.label}</description>
</setupTask> </setupTask>
@ -107,7 +107,7 @@
name="com.minres.structural.target"> name="com.minres.structural.target">
<description>Sets the Structural target platform</description> <description>Sets the Structural target platform</description>
</setupTask> </setupTask>
<stream name="${minres-git-stream}" <stream name="${git.stream}"
label="Stream to checkout"/> label="Stream to checkout"/>
<description>A Xtext based Structural editor with syntax highlighting and context sensitive help.</description> <description>A Xtext based Structural editor with syntax highlighting and context sensitive help.</description>
</setup:Project> </setup:Project>

View File

@ -15,105 +15,21 @@
name="Global Variables"> name="Global Variables">
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="github.user.id" name="git.user.id"
defaultValue="anonymous" defaultValue="anonymous"
label="Github user ID"> label="User ID">
<description>The user ID of the Github account</description> <description>The user ID of the MINRES account</description>
</setupTask> </setupTask>
<setupTask <setupTask
xsi:type="setup:VariableTask" xsi:type="setup:VariableTask"
name="github.author.name" name="git.stream"
label="Github author name"> defaultValue="master"
<description>The author name used for Github commits</description> label="Stream to checkout">
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="github.author.email"
label="Github author email">
<description>The email address associated with Github commits</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
type="PASSWORD"
name="github.user.password"
label="Github password for issues">
<annotation
source="http://www.eclipse.org/oomph/setup/PasswordVerificationDisabled">
<detail
key="type">
<value>form</value>
</detail>
<detail
key="form.url">
<value>https://github.com/session</value>
</detail>
<detail
key="form.cookie">
<value>PHPSESSID</value>
</detail>
<detail
key="form.parameters">
<value>login password authenticity_token utf8 commit</value>
</detail>
<detail
key="form.secure.parameters">
<value>password</value>
</detail>
<detail
key="form.filter">
<value>login=anonymous\&amp;.*</value>
</detail>
<detail
key="form.parameter.login">
<value>$${github.user.id}</value>
</detail>
<detail
key="form.parameter.password">
<value>$${value}</value>
</detail>
<detail
key="form.parameter.utf8">
<value>✓</value>
</detail>
<detail
key="form.parameter.commit">
<value>Sign in</value>
</detail>
<detail
key="form.ok">
<value>Valid password for $${form.parameter.login} at $${form.url}.</value>
</detail>
<detail
key="form.info">
<value>Validate the password for $${form.parameter.login} at $${form.url}.</value>
</detail>
<detail
key="form.warning">
<value>Unable to validate the password for $${form.parameter.login} because $${form.url} is unreachable.</value>
</detail>
<detail
key="form.error">
<value>Invalid password for $${form.parameter.login} at $${form.url}.</value>
</detail>
</annotation>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="github.remoteURIs"
label="Github repository">
<choice <choice
value="git@github.com:@{remoteURI}.git" value="master"/>
label="Git (read-write)"/>
<choice <choice
value="https://${github.user.id|username}@github.com/@{remoteURI}.git" value="develop"/>
label="HTTPS (read-write)"> <description>Stream to checkout</description>
<annotation
source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
</choice>
<choice
value="https://github.com/@{remoteURI}.git"
label="HTTPS (read-only, anonymous)"/>
<description>Choose from the available Github URIs</description>
</setupTask> </setupTask>
</setupTask> </setupTask>
<setupTask <setupTask
@ -140,22 +56,8 @@
<setupTask <setupTask
xsi:type="git:GitCloneTask" xsi:type="git:GitCloneTask"
id="git.clone.systemc.quickstart" id="git.clone.systemc.quickstart"
remoteURI="Minres/SystemC-Quickstart"> remoteURI="https://${git.user.id}@git.minres.com/SystemC/SystemC-Quickstart.git"
<annotation recursive="true">
source="http://www.eclipse.org/oomph/setup/InducedChoices">
<detail
key="inherit">
<value>github.remoteURIs</value>
</detail>
<detail
key="label">
<value>${scope.project.label} Git repository</value>
</detail>
<detail
key="target">
<value>remoteURI</value>
</detail>
</annotation>
<description>${scope.project.label}</description> <description>${scope.project.label}</description>
</setupTask> </setupTask>
<setupTask <setupTask
@ -163,9 +65,7 @@
<sourceLocator <sourceLocator
rootFolder="${git.clone.systemc.quickstart.location}"/> rootFolder="${git.clone.systemc.quickstart.location}"/>
</setupTask> </setupTask>
<stream name="master"/> <stream name="${git.stream}"
<logicalProjectContainer label="Stream to checkout"/>
xsi:type="setup:ProjectCatalog"
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
<description>A simple C++ CMake project to jump-start development of SystemC models and systems </description> <description>A simple C++ CMake project to jump-start development of SystemC models and systems </description>
</setup:Project> </setup:Project>