Skip to content

Commit 5919042

Browse files
mmhelloworldmmhelloworld
committed
Self host 0.4.0, deploy to maven
1 parent 6faeff1 commit 5919042

File tree

19 files changed

+377
-222
lines changed

19 files changed

+377
-222
lines changed

‎.github/workflows/install.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
distribution: 'adopt'
2727
cache: 'maven'
2828
- name: Set IDRIS2_PREFIX
29-
run: echo "IDRIS2_PREFIX=$HOME/bin/idris2-0.3.1/lib" >> $GITHUB_ENV
29+
run: echo "IDRIS2_PREFIX=$HOME/bin/idris2-0.4.0-SNAPSHOT/lib" >> $GITHUB_ENV
3030
- name: Set PREFIX
3131
run: echo "PREFIX=$IDRIS2_PREFIX" >> $GITHUB_ENV
3232
- name: Download previous version
3333
run: |
34-
wget https://github.com/mmhelloworld/idris-jvm/releases/download/v0.3.1/idris2-0.3.1.zip
35-
unzip idris2-0.3.1.zip -d $HOME/bin
36-
echo "::add-path::$HOME/bin/idris2-0.3.1/bin"
34+
wget https://github.com/mmhelloworld/idris-jvm/releases/download/v0.4.0-rc.4/idris2-0.4.0-SNAPSHOT.zip
35+
unzip idris2-0.4.0-SNAPSHOT.zip -d $HOME/bin
36+
echo "::add-path::$HOME/bin/idris2-0.4.0-SNAPSHOT/bin"
3737
- name: Build
3838
run: mvn --batch-mode install -Dinteractive= -Didris.tests="only=jvm"

‎.github/workflows/pre-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
distribution: 'adopt'
2525
cache: 'maven'
2626
- name: Set IDRIS2_PREFIX
27-
run: echo "IDRIS2_PREFIX=$HOME/bin/idris2-0.3.1/lib" >> $GITHUB_ENV
27+
run: echo "IDRIS2_PREFIX=$HOME/bin/idris2-0.4.0-SNAPSHOT/lib" >> $GITHUB_ENV
2828
- name: Set PREFIX
2929
run: echo "PREFIX=$IDRIS2_PREFIX" >> $GITHUB_ENV
3030
- name: Download previous version
3131
run: |
32-
wget https://github.com/mmhelloworld/idris-jvm/releases/download/v0.3.1/idris2-0.3.1.zip
33-
unzip idris2-0.3.1.zip -d $HOME/bin
34-
echo "::add-path::$HOME/bin/idris2-0.3.1/bin"
32+
wget https://github.com/mmhelloworld/idris-jvm/releases/download/v0.4.0-rc.4/idris2-0.4.0-SNAPSHOT.zip
33+
unzip idris2-0.4.0-SNAPSHOT.zip -d $HOME/bin
34+
echo "::add-path::$HOME/bin/idris2-0.4.0-SNAPSHOT/bin"
3535
- name: Build
3636
run: mvn --batch-mode install -DskipTests
3737

‎.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ jobs:
2424
distribution: 'adopt'
2525
cache: 'maven'
2626
- name: Set IDRIS2_PREFIX
27-
run: echo "IDRIS2_PREFIX=$HOME/bin/idris2-0.3.1/lib" >> $GITHUB_ENV
27+
run: echo "IDRIS2_PREFIX=$HOME/bin/idris2-0.4.0-SNAPSHOT/lib" >> $GITHUB_ENV
2828
- name: Set PREFIX
2929
run: echo "PREFIX=$IDRIS2_PREFIX" >> $GITHUB_ENV
3030
- name: Download previous version
3131
run: |
32-
wget https://github.com/mmhelloworld/idris-jvm/releases/download/v0.3.1/idris2-0.3.1.zip
33-
unzip idris2-0.3.1.zip -d $HOME/bin
34-
echo "::add-path::$HOME/bin/idris2-0.3.1/bin"
32+
wget https://github.com/mmhelloworld/idris-jvm/releases/download/v0.4.0-rc.4/idris2-0.4.0-SNAPSHOT.zip
33+
unzip idris2-0.4.0-SNAPSHOT.zip -d $HOME/bin
34+
echo "::add-path::$HOME/bin/idris2-0.4.0-SNAPSHOT/bin"
3535
- name: Build
3636
run: mvn --batch-mode install -DskipTests
3737

3838
- uses: "marvinpinto/action-automatic-releases@latest"
3939
with:
4040
repo_token: "${{ secrets.GITHUB_TOKEN }}"
4141
prerelease: false
42-
title: "Release 0.4.0-rc.4"
42+
title: "Release 0.4.0-rc.5"
4343
files: |
4444
idris-jvm-compiler/target/idris2-0.4.0-SNAPSHOT.zip

‎IDRIS2-LICENSE

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
Copyright (c) 2020 Edwin Brady
2+
School of Computer Science, University of St Andrews
3+
All rights reserved.
4+
5+
This code is derived from software written by Edwin Brady
6+
([email protected]).
7+
8+
Redistribution and use in source and binary forms, with or without
9+
modification, are permitted provided that the following conditions
10+
are met:
11+
1. Redistributions of source code must retain the above copyright
12+
notice, this list of conditions and the following disclaimer.
13+
2. Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in the
15+
documentation and/or other materials provided with the distribution.
16+
3. None of the names of the copyright holders may be used to endorse
17+
or promote products derived from this software without specific
18+
prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
21+
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
23+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE
24+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
27+
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
28+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
29+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
30+
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31+
32+
*** End of disclaimer. ***

‎LICENSE

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1-
Copyright (c) 2020 Edwin Brady
2-
School of Computer Science, University of St Andrews
3-
All rights reserved.
1+
Copyright Marimuthu Madasamy (c) 2021
42

5-
This code is derived from software written by Edwin Brady
6-
([email protected]).
3+
All rights reserved.
74

85
Redistribution and use in source and binary forms, with or without
9-
modification, are permitted provided that the following conditions
10-
are met:
11-
1. Redistributions of source code must retain the above copyright
12-
notice, this list of conditions and the following disclaimer.
13-
2. Redistributions in binary form must reproduce the above copyright
14-
notice, this list of conditions and the following disclaimer in the
15-
documentation and/or other materials provided with the distribution.
16-
3. None of the names of the copyright holders may be used to endorse
17-
or promote products derived from this software without specific
18-
prior written permission.
6+
modification, are permitted provided that the following conditions are met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
11+
* Redistributions in binary form must reproduce the above
12+
copyright notice, this list of conditions and the following
13+
disclaimer in the documentation and/or other materials provided
14+
with the distribution.
1915

20-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
21-
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
23-
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE
24-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
27-
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
28-
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
29-
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
30-
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16+
* Neither the name of Marimuthu Madasamy nor the names of other
17+
contributors may be used to endorse or promote products derived
18+
from this software without specific prior written permission.
3119

32-
*** End of disclaimer. ***
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎idris-jvm-assembler/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>idris-jvm-assembler</artifactId>
13-
<name>Idris 2 JVM Assembler</name>
13+
<name>Idris JVM Assembler</name>
1414

1515
<dependencies>
1616
<dependency>
@@ -47,4 +47,4 @@
4747
<scope>test</scope>
4848
</dependency>
4949
</dependencies>
50-
</project>
50+
</project>

‎idris-jvm-assembler/src/main/java/io/github/mmhelloworld/idrisjvm/assembler/IdrisName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static IdrisList getIdrisFunctionName(String programName, String idrisNam
6363
}
6464

6565
public static String getIdrisConstructorClassName(String idrisName) {
66-
return String.join("/", addModulePrefix("main", asList((idrisName).split("/"))));
66+
return String.join("/", addModulePrefix("main", asList(idrisName.split("/"))));
6767
}
6868

6969
public static String transformCharacters(String value) {

‎idris-jvm-compiler/pom.xml

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>idris-jvm-compiler</artifactId>
13-
<name>Idris 2 JVM Compiler</name>
13+
<name>Idris JVM Compiler</name>
1414

1515
<properties>
1616
<maven.compiler.source>8</maven.compiler.source>
@@ -20,44 +20,26 @@
2020
<skipIdrisClean>false</skipIdrisClean>
2121
</properties>
2222

23-
<profiles>
24-
<profile>
25-
<id>IDRIS2_PREFIX</id>
26-
<activation>
27-
<property>
28-
<name>!env.IDRIS2_PREFIX</name>
29-
</property>
30-
</activation>
31-
<properties>
32-
<env.IDRIS2_PREFIX>${user.home}/.idris2</env.IDRIS2_PREFIX>
33-
</properties>
34-
</profile>
35-
</profiles>
36-
3723
<build>
24+
<sourceDirectory>${project.parent.basedir}/src</sourceDirectory>
3825
<plugins>
3926
<plugin>
40-
<artifactId>maven-jar-plugin</artifactId>
27+
<groupId>org.codehaus.mojo</groupId>
28+
<artifactId>build-helper-maven-plugin</artifactId>
4129
<executions>
4230
<execution>
43-
<id>default-jar</id>
44-
<phase>none</phase>
31+
<phase>generate-sources</phase>
32+
<goals>
33+
<goal>add-source</goal>
34+
</goals>
4535
<configuration>
46-
<finalName>unwanted</finalName>
47-
<classifier>unwanted</classifier>
36+
<sources>
37+
<source>${project.parent.basedir}/libs</source>
38+
</sources>
4839
</configuration>
4940
</execution>
5041
</executions>
5142
</plugin>
52-
<plugin>
53-
<artifactId>maven-install-plugin</artifactId>
54-
<executions>
55-
<execution>
56-
<id>default-install</id>
57-
<phase>none</phase>
58-
</execution>
59-
</executions>
60-
</plugin>
6143
<plugin>
6244
<groupId>org.codehaus.mojo</groupId>
6345
<artifactId>exec-maven-plugin</artifactId>
@@ -139,9 +121,10 @@
139121
<move file="../build/exec/idris2_app/idris2.jar"
140122
tofile="../build/exec/idris2_app/idris-jvm-compiler-${project.version}.jar"
141123
failonerror="false"
142-
quiet="true"/>
124+
overwrite="true"/>
143125
<copy file="../build/exec/idris2_app/idris-jvm-compiler-${project.version}.jar"
144-
tofile="./target/idris-jvm-compiler-${project.version}.jar"/>
126+
tofile="./target/idris-jvm-compiler-${project.version}.jar"
127+
overwrite="true"/>
145128
</target>
146129
</configuration>
147130
</execution>
@@ -154,7 +137,8 @@
154137
<configuration>
155138
<target>
156139
<copy file="../build/exec/idris2_app/idris-jvm-compiler-${project.version}.jar"
157-
tofile="./target/assembly/lib/idris-jvm-compiler-${project.version}.jar"/>
140+
tofile="./target/assembly/lib/idris-jvm-compiler-${project.version}.jar"
141+
overwrite="true"/>
158142
</target>
159143
</configuration>
160144
</execution>

‎idris-jvm-runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<name>Idris 2 JVM Runtime</name>
12+
<name>Idris JVM Runtime</name>
1313
<build>
1414
<plugins>
1515
<plugin>

‎idris-jvm-tests/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>idris-jvm-tests</artifactId>
13-
<name>Idris 2 JVM Tests</name>
13+
<name>Idris JVM Tests</name>
1414

1515
<properties>
1616
<maven.compiler.source>8</maven.compiler.source>
@@ -161,6 +161,13 @@
161161
</execution>
162162
</executions>
163163
</plugin>
164+
<plugin>
165+
<groupId>org.apache.maven.plugins</groupId>
166+
<artifactId>maven-deploy-plugin</artifactId>
167+
<configuration>
168+
<skip>true</skip>
169+
</configuration>
170+
</plugin>
164171
</plugins>
165172
</build>
166173

0 commit comments

Comments
 (0)