diff --git a/.github/workflows/ant-lara-2.0-legacy.yml b/.github/workflows/ant-lara-2.0-legacy.yml new file mode 100644 index 000000000..84b3d5d37 --- /dev/null +++ b/.github/workflows/ant-lara-2.0-legacy.yml @@ -0,0 +1,74 @@ +# This workflow will build a Java project with Ant +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-ant + +name: Java CI - Lara 2.0 Legacy + +on: + push: + branches: [ lara-2.0-legacy ] + pull_request: + branches: [ lara-2.0-legacy ] + + # Daily at midnight + schedule: + - cron: '0 0 * * *' +jobs: + build: + + runs-on: ubuntu-latest + + #defaults: + # run: + # working-directory: ./.. + + steps: + + - uses: actions/checkout@v3 + + #- name: Show working dir + # run: | + # ls -la + # + #- name: Show parent dir + # run: | + # ls -la ../ + # + #- name: Show home dir + # run: | + # ls -la ~/ + + - name: Cache ivy dependencies + id: cache-nivy + uses: actions/cache@v3 + env: + cache-name: cache-ivy-dependencies + with: + # ivy dependencies cache files are stored in `~/.ivy2` on Linux/macOS + path: ~/.ivy2 + key: ${{ runner.os }}-build-${{ env.cache-name }} + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: Generate build.xml + run: | + wget -N http://specs.fe.up.pt/tools/eclipse-build.jar + java -jar eclipse-build.jar https://github.com/specs-feup/specs-java-libs ./ + wget -N -O /usr/share/ant/lib/ivy-2.5.0.jar specs.fe.up.pt/libs/ivy-2.5.0.jar + - name: Build with Ant + run: | + ant -noinput -buildfile build.xml + #- name: Copy test results + # run: | + # # Tried relative paths (not supported by junit action) and symlinks (are not followed by glob) + # # Resorted to copying the tests to a folder in the repo folder + # cp -a reports-eclipse-build/. lara-framework/junit-reports/ + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3.0.1 + if: always() # always run even if the previous step fails + with: + report_paths: '**/reports-eclipse-build/TEST-*.xml' + summary: true + #exclude_sources: '' diff --git a/.github/workflows/ant-lara-js.yml b/.github/workflows/ant-lara-js.yml new file mode 100644 index 000000000..266d72cdf --- /dev/null +++ b/.github/workflows/ant-lara-js.yml @@ -0,0 +1,74 @@ +# This workflow will build a Java project with Ant +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-ant + +name: Java CI - Lara JS + +on: + push: + branches: [ feature/lara-js ] + pull_request: + branches: [ feature/lara-js ] + + # Daily at midnight + schedule: + - cron: '0 0 * * *' +jobs: + build: + + runs-on: ubuntu-latest + + #defaults: + # run: + # working-directory: ./.. + + steps: + + - uses: actions/checkout@v3 + + #- name: Show working dir + # run: | + # ls -la + # + #- name: Show parent dir + # run: | + # ls -la ../ + # + #- name: Show home dir + # run: | + # ls -la ~/ + + - name: Cache ivy dependencies + id: cache-nivy + uses: actions/cache@v3 + env: + cache-name: cache-ivy-dependencies + with: + # ivy dependencies cache files are stored in `~/.ivy2` on Linux/macOS + path: ~/.ivy2 + key: ${{ runner.os }}-build-${{ env.cache-name }} + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: Generate build.xml + run: | + wget -N http://specs.fe.up.pt/tools/eclipse-build.jar + java -jar eclipse-build.jar https://github.com/specs-feup/specs-java-libs ./ + wget -N -O /usr/share/ant/lib/ivy-2.5.0.jar specs.fe.up.pt/libs/ivy-2.5.0.jar + - name: Build with Ant + run: | + ant -noinput -buildfile build.xml + #- name: Copy test results + # run: | + # # Tried relative paths (not supported by junit action) and symlinks (are not followed by glob) + # # Resorted to copying the tests to a folder in the repo folder + # cp -a reports-eclipse-build/. lara-framework/junit-reports/ + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3.0.1 + if: always() # always run even if the previous step fails + with: + report_paths: '**/reports-eclipse-build/TEST-*.xml' + summary: true + #exclude_sources: '' diff --git a/.github/workflows/ant-staging.yml b/.github/workflows/ant-staging.yml index 8e27c257d..2317f6ebf 100644 --- a/.github/workflows/ant-staging.yml +++ b/.github/workflows/ant-staging.yml @@ -9,6 +9,10 @@ on: pull_request: branches: [ staging ] + # Daily at midnight + schedule: + - cron: '0 0 * * *' + jobs: build: diff --git a/LARAC/.classpath b/LARAC/.classpath index 78381cc78..21ea32667 100644 --- a/LARAC/.classpath +++ b/LARAC/.classpath @@ -1,26 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + - + + diff --git a/LARAC/.project b/LARAC/.project index 19a1c3d51..028c214a0 100644 --- a/LARAC/.project +++ b/LARAC/.project @@ -6,26 +6,20 @@ - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder + sf.eclipse.javacc.core.javaccbuilder - sf.eclipse.javacc.core.javaccbuilder + org.eclipse.jdt.core.javabuilder org.eclipse.jdt.core.javanature - org.apache.ivyde.eclipse.ivynature sf.eclipse.javacc.core.javaccnature - org.eclipse.buildship.core.gradleprojectnature + org.apache.ivyde.eclipse.ivynature diff --git a/LARAI/.classpath b/LARAI/.classpath index 271fe28ca..ba84200c9 100644 --- a/LARAI/.classpath +++ b/LARAI/.classpath @@ -1,28 +1,15 @@ - + + + + - - - + - - - - - - - - - - - - - - - - + + @@ -35,5 +22,5 @@ - + diff --git a/LARAI/.project b/LARAI/.project index 072519f89..59cb7c4c5 100644 --- a/LARAI/.project +++ b/LARAI/.project @@ -10,16 +10,10 @@ - - org.eclipse.buildship.core.gradleprojectbuilder - - - org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature - org.eclipse.buildship.core.gradleprojectnature diff --git a/LARAI/resources/larai/test/weaver/results/WeaverOptionsTest.lara.txt b/LARAI/resources/larai/test/weaver/results/WeaverOptionsTest.lara.txt index dfed0926b..c6a3c7349 100644 --- a/LARAI/resources/larai/test/weaver/results/WeaverOptionsTest.lara.txt +++ b/LARAI/resources/larai/test/weaver/results/WeaverOptionsTest.lara.txt @@ -1,5 +1,5 @@ Original verbose level: 2 New verbose level: 3 -Original output folder: undefined +Original output folder: . New output folder: subfolder Supported languages: [] \ No newline at end of file diff --git a/LanguageSpecification/resources/pt/up/fe/specs/lara/langspec/test/ActionModelTest.txt b/LanguageSpecification/resources/pt/up/fe/specs/lara/langspec/test/ActionModelTest.txt index c5539a1a5..f3a30633d 100644 --- a/LanguageSpecification/resources/pt/up/fe/specs/lara/langspec/test/ActionModelTest.txt +++ b/LanguageSpecification/resources/pt/up/fe/specs/lara/langspec/test/ActionModelTest.txt @@ -2,16 +2,12 @@ loop own actions: optimize loop all actions: Name: optimize -Name: insert -Name: def Name: def Name: insert Name: out Name: replaceWith body all actions: Name: testbody -Name: insert -Name: def Name: def Name: insert Name: out diff --git a/LanguageSpecification/resources/pt/up/fe/specs/lara/langspec/test/ParserTestResult.txt b/LanguageSpecification/resources/pt/up/fe/specs/lara/langspec/test/ParserTestResult.txt index 0e94fa546..ea872e30a 100644 --- a/LanguageSpecification/resources/pt/up/fe/specs/lara/langspec/test/ParserTestResult.txt +++ b/LanguageSpecification/resources/pt/up/fe/specs/lara/langspec/test/ParserTestResult.txt @@ -1,8 +1,5 @@ root file as root joinpoint joinpoint { - String[] attributes - String[] selects - String[] actions joinpoint ancestor(String type) int cost int end_col @@ -18,13 +15,10 @@ joinpoint joinpoint { int num_oper int num_pointer_refs int size - Boolean instanceOf(String name) selects { } actions { - void insert([before| after| replace], String code) - void def(String attribute, Object value) void def(String attribute, Object value) void insert(String position = before, String code) void out(String code) diff --git a/LaraApi/.classpath b/LaraApi/.classpath index 74a523856..2219f4786 100644 --- a/LaraApi/.classpath +++ b/LaraApi/.classpath @@ -1,23 +1,17 @@ - + + + - - + - - - - - - - - + - + diff --git a/LaraApi/.project b/LaraApi/.project index 7ba99c020..e5ce6a939 100644 --- a/LaraApi/.project +++ b/LaraApi/.project @@ -10,16 +10,10 @@ - - org.eclipse.buildship.core.gradleprojectbuilder - - - org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature - org.eclipse.buildship.core.gradleprojectnature diff --git a/WeaverGenerator/.classpath b/WeaverGenerator/.classpath index cf91e467c..30c91257c 100644 --- a/WeaverGenerator/.classpath +++ b/WeaverGenerator/.classpath @@ -19,5 +19,6 @@ +