Skip to content

Commit e49d378

Browse files
eyckeyck
committed
Merge branch 'release/2.0.1'
2 parents 9b91593 + a72b853 commit e49d378

21 files changed

Lines changed: 1849 additions & 433 deletions

File tree

‎README.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
[![Java CI with Maven](https://github.com/Minres/CoreDSL/actions/workflows/maven.yml/badge.svg)](https://github.com/Minres/CoreDSL/actions/workflows/maven.yml)
2+
13
# CoreDSL
24

3-
This repo contains the XText bundles/plugins for CoreDSL. The bundles can be installed from https://minres.com/download/repository/CoreDSL
5+
This repo contains the XText bundles/plugins for [CoreDSL](https://minres.github.io/CoreDSL). The OSGI bundles can be installed from https://minres.github.io/CoreDSL/repository.
6+
7+
## Language documentation
8+
9+
[Programmer's manual](https://github.com/Minres/CoreDSL/wiki/CoreDSL-2-programmer's-manual)
10+
411

512
## References
613

@@ -9,7 +16,3 @@ https://www.lysator.liu.se/c/ANSI-C-grammar-y.html
916
## EBNF
1017

1118
The generated ANTLR grammar (DebugInternalCoreDsl.g) can be converted into EBNF using https://bottlecaps.de/convert/ to create a formal specification of the language
12-
13-
## Language documentation
14-
15-
[Programmer's manual](https://github.com/Minres/CoreDSL/wiki/CoreDSL-2-programmer's-manual)

‎com.minres.coredsl.repository/packaging-p2-composite.ant‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0"?>
2+
<project name="project">
3+
4+
<target name="getMajorMinorVersion">
5+
<script language="javascript">
6+
<![CDATA[
7+
8+
// getting the value
9+
buildnumber = project.getProperty("unqualifiedVersion");
10+
index = buildnumber.lastIndexOf(".");
11+
counter = buildnumber.substring(0, index);
12+
project.setProperty("majorMinorVersion",counter);
13+
14+
]]>
15+
</script>
16+
</target>
17+
18+
<target name="test_getMajorMinor" depends="getMajorMinorVersion">
19+
<echo message="majorMinorVersion: ${majorMinorVersion}"/>
20+
</target>
21+
22+
<!--
23+
site.label The name/title/label of the created composite site
24+
unqualifiedVersion The version without any qualifier replacement
25+
buildQualifier The build qualifier
26+
-->
27+
<target name="compute.child.repository.data" depends="getMajorMinorVersion">
28+
<property name="full.version" value="${unqualifiedVersion}" />
29+
30+
<property name="software.download.area" location="${user.home}/p2.repositories" />
31+
<property name="updates.dir" value="updates" />
32+
33+
<property name="site.composite.name" value="${site.label} ${majorMinorVersion}" />
34+
<property name="main.site.composite.name" value="${site.label} All Versions" />
35+
36+
<!--
37+
<property name="main.composite.repository.directory" location="${software.download.area}/${updates.dir}" />
38+
-->
39+
<property name="main.composite.repository.directory" location="${software.download.area}" />
40+
41+
<property name="composite.repository.directory" value="${main.composite.repository.directory}/${majorMinorVersion}" />
42+
<property name="child.repository" value="${full.version}" />
43+
<property name="child.repository.directory" value="${composite.repository.directory}/${child.repository}/" />
44+
</target>
45+
46+
<target name="p2.composite.add" depends="compute.child.repository.data">
47+
<property name="source.repository" location="${project.build.directory}/repository"/>
48+
49+
<echo message=" " />
50+
51+
<echo message="Source repository path: ${source.repository}" />
52+
53+
<echo message="Copying to ${child.repository.directory}..." />
54+
55+
<mkdir dir="${child.repository.directory}"/>
56+
<copy todir="${child.repository.directory}" overwrite="true">
57+
<fileset dir="${source.repository}" />
58+
</copy>
59+
60+
<add.composite.repository.internal
61+
composite.repository.location="${composite.repository.directory}"
62+
composite.repository.name="${site.composite.name}"
63+
composite.repository.child="${child.repository}"
64+
/>
65+
66+
<add.composite.repository.internal
67+
composite.repository.location="${main.composite.repository.directory}"
68+
composite.repository.name="${main.site.composite.name}"
69+
composite.repository.child="${majorMinorVersion}"
70+
/>
71+
72+
</target>
73+
74+
<!-- = = = = = = = = = = = = = = = = =
75+
macrodef: add.composite.repository.internal
76+
= = = = = = = = = = = = = = = = = -->
77+
<macrodef name="add.composite.repository.internal">
78+
<attribute name="composite.repository.location" />
79+
<attribute name="composite.repository.name" />
80+
<attribute name="composite.repository.child" />
81+
<sequential>
82+
83+
<echo message=" " />
84+
<echo message="Composite repository : @{composite.repository.location}" />
85+
<echo message="Composite name : @{composite.repository.name}" />
86+
<echo message="Adding child repository : @{composite.repository.child}" />
87+
88+
<p2.composite.repository>
89+
<repository compressed="false" location="@{composite.repository.location}" name="@{composite.repository.name}" />
90+
<add>
91+
<repository location="@{composite.repository.child}" />
92+
</add>
93+
</p2.composite.repository>
94+
95+
<echo file="@{composite.repository.location}/p2.index">version=1
96+
metadata.repository.factory.order=compositeContent.xml,\!
97+
artifact.repository.factory.order=compositeArtifacts.xml,\!
98+
</echo>
99+
100+
</sequential>
101+
</macrodef>
102+
103+
104+
</project>

‎com.minres.coredsl.repository/pom.xml‎

Lines changed: 79 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<project xmlns="http://maven.apache.org/POM/4.0.0"
23
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -6,11 +7,10 @@
67
<groupId>com.minres.coredsl</groupId>
78
<artifactId>com.minres.coredsl.parent</artifactId>
89
<version>2.0.1-SNAPSHOT</version>
9-
<relativePath>..</relativePath>
10+
<relativePath>..</relativePath>
1011
</parent>
1112
<artifactId>com.minres.coredsl.repository</artifactId>
1213
<packaging>eclipse-repository</packaging>
13-
1414
<build>
1515
<pluginManagement>
1616
<plugins>
@@ -37,7 +37,7 @@
3737
</goals>
3838
</pluginExecutionFilter>
3939
<action>
40-
<ignore></ignore>
40+
<ignore />
4141
</action>
4242
</pluginExecution>
4343
</pluginExecutions>
@@ -46,6 +46,15 @@
4646
</plugin>
4747
</plugins>
4848
</pluginManagement>
49+
50+
<extensions>
51+
<!-- Enabling the use of FTP -->
52+
<extension>
53+
<groupId>org.apache.maven.wagon</groupId>
54+
<artifactId>wagon-ftp</artifactId>
55+
<version>1.0-beta-6</version>
56+
</extension>
57+
</extensions>
4958
</build>
5059
<profiles>
5160
<profile>
@@ -70,33 +79,77 @@
7079
</executions>
7180
</plugin>
7281
<plugin>
73-
<groupId>com.carrotgarden.maven</groupId>
74-
<artifactId>bintray-maven-plugin</artifactId>
75-
<version>1.5.20191113165555</version>
82+
<groupId>org.codehaus.mojo</groupId>
83+
<artifactId>exec-maven-plugin</artifactId>
84+
<version>3.0.0</version>
85+
<executions>
86+
<execution>
87+
<phase>package</phase>
88+
<goals>
89+
<goal>exec</goal>
90+
</goals>
91+
</execution>
92+
</executions>
7693
<configuration>
77-
<skip>false</skip>
78-
<!-- Bintray organization name. -->
79-
<subject>minres</subject>
80-
<!-- Bintray target repository. -->
81-
<repository>eclipse</repository>
82-
<!-- Bintray package name. -->
83-
<bintrayPackage>CoreDSL</bintrayPackage>
84-
<bintrayVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</bintrayVersion>
85-
<packageVcsUrl>https://github.com/Minres/CoreDSL.git</packageVcsUrl>
86-
<!-- Local folder content to sync to the remote repo. -->
87-
<sourceFolder>${project.build.directory}/repository</sourceFolder>
88-
<!-- Remote folder for local content upload, relative path. -->
89-
<targetFolder>CoreDSL/${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</targetFolder>
90-
91-
<!-- Bintray credentials in settings.xml. -->
92-
<serverId>bintray-minres-deploy</serverId>
94+
<executable>bash</executable>
95+
<!-- optional -->
96+
<workingDirectory>${software.download.area}</workingDirectory>
97+
<arguments>
98+
<argument>-c</argument>
99+
<argument>if [ -d CoreDSL-gh ]; then cd CoreDSL-gh; git pull; else git clone --branch gh-pages https://github.com/Minres/CoreDSL.git CoreDSL-gh; fi</argument>
100+
</arguments>
101+
<environmentVariables>
102+
<LANG>en_US</LANG>
103+
</environmentVariables>
104+
</configuration>
105+
</plugin>
106+
<plugin>
107+
<groupId>org.eclipse.tycho.extras</groupId>
108+
<artifactId>tycho-eclipserun-plugin</artifactId>
109+
<version>${tycho-version}</version>
110+
<configuration>
111+
<!-- IMPORTANT: DO NOT split the arg line -->
112+
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2-composite.ant p2.composite.add -Dsite.label="CoreDSL Software Repository" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} -Dsoftware.download.area="${software.download.area}/CoreDSL-gh/repository"</appArgLine>
113+
<repositories>
114+
<repository>
115+
<id>2020-03</id>
116+
<layout>p2</layout>
117+
<url>http://download.eclipse.org/releases/2020-03/</url>
118+
</repository>
119+
</repositories>
120+
<dependencies>
121+
<dependency>
122+
<artifactId>org.eclipse.ant.core</artifactId>
123+
<type>eclipse-plugin</type>
124+
</dependency>
125+
<dependency>
126+
<artifactId>org.apache.ant</artifactId>
127+
<type>eclipse-plugin</type>
128+
</dependency>
129+
<dependency>
130+
<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
131+
<type>eclipse-plugin</type>
132+
</dependency>
133+
<dependency>
134+
<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
135+
<type>eclipse-feature</type>
136+
</dependency>
137+
<dependency>
138+
<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
139+
<type>eclipse-feature</type>
140+
</dependency>
141+
<dependency>
142+
<artifactId>org.eclipse.equinox.ds</artifactId>
143+
<type>eclipse-plugin</type>
144+
</dependency>
145+
</dependencies>
93146
</configuration>
94147
<executions>
95-
<!-- Activate "bintray:upload" during "package" -->
96148
<execution>
149+
<id>add-p2-composite-repository</id>
97150
<phase>package</phase>
98151
<goals>
99-
<goal>upload</goal>
152+
<goal>eclipse-run</goal>
100153
</goals>
101154
</execution>
102155
</executions>
@@ -106,6 +159,6 @@
106159
</profile>
107160
</profiles>
108161

109-
<dependencies>
110-
</dependencies>
162+
<dependencies />
163+
111164
</project>

‎com.minres.coredsl.repository/upload.sh‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/bash
2+
##
3+
4+
[ -f $HOME/.upload.sh.cfg ] && . $HOME/.upload.sh.cfg
5+
6+
7+
cd target/repository
8+
artifactory_url='https://artifactory.minres.com/artifactory'
9+
repo_module='eclipse/CoreDSL'
10+
baseurls="h/test-repo/CoreDSL/$1 https://artifactory.minres.com/artifactory/test-repo/CoreDSL/latest"
11+
file_list=`find . -type f | grep -v p2.index`
12+
13+
echo Uploading P2 artifacts to ${artifactory_url}/${repo_module}/${1}
14+
15+
for artifact_name in $file_list; do
16+
echo Processing $artifact_name
17+
for version in $1 latest; do
18+
sha256=$(openssl dgst -sha256 ${artifact_name}|sed 's/^SHA256.*= //')
19+
sha1=$(openssl dgst -sha1 ${artifact_name}|sed 's/^SHA.*= //')
20+
md5=$(openssl dgst -md5 ${artifact_name}|sed 's/^MD5.*= //')
21+
# Upload artifact to artifactory
22+
curl -sSf -u${USERNAME}:${PASSWORD} -T ${artifact_name} \
23+
-H "X-Checksum-Sha256:${sha256}" \
24+
-H "X-Checksum-Sha1:${sha1}" \
25+
-H "X-Checksum-md5:${md5}" \
26+
${artifactory_url}/${repo_module}/${version}/$artifact_name > /dev/null
27+
done
28+
done
29+

‎com.minres.coredsl.tests/inputs/sqrt.core_desc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ InstructionSet Vec2D {
99
} ISAXRegFile[32];
1010
struct simd{
1111
unsigned a1;
12-
unsigned a1;
12+
unsigned a2;
1313
unsigned a3;
1414
unsigned a4;
1515
};

0 commit comments

Comments
 (0)