Merge branch 'feature/lara-js' of github.com:specs-feup/lara-framewor…

…k into feature/lara-js
specs-feup · Jul 27, 2024 · 65f228d · 65f228d
2 parents 48e2282 + 91fa628
commit 65f228d
Show file tree

Hide file tree

Showing 13 changed files with 180 additions and 81 deletions.
diff --git a/.github/workflows/ant-lara-2.0-legacy.yml 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/[email protected]
+      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
@@ -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/[email protected]
+      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
@@ -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
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin/main" path="src">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="bin/test" path="test">
-		<attributes>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/WeaverInterface"/>
 	<classpathentry exported="true" kind="src" path="/SpecsUtils"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/LanguageSpecification"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/tdrcLibrary"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/LaraUtils"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/CommonsCompressPlus"/>
 	<classpathentry exported="true" kind="src" path="/CommonsLangPlus"/>
-	<classpathentry kind="output" path="bin/default"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=LARAC&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/LARAC/.project b/LARAC/.project
@@ -6,26 +6,20 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<name>sf.eclipse.javacc.core.javaccbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>sf.eclipse.javacc.core.javaccbuilder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 		<nature>sf.eclipse.javacc.core.javaccnature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
 	<filteredResources>
 		<filter>

diff --git a/LARAI/.classpath b/LARAI/.classpath
@@ -1,28 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin/test" path="src">
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="src" path="resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
-			<attribute name="test" value="true"/>
+			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="bin/test" path="test">
-		<attributes>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="bin/test" path="resources">
-		<attributes>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=LARAI&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/LaraLoc"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/GitPlus"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/CommonsLangPlus"/>
@@ -35,5 +22,5 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/LARAC"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JsEngine"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/LaraCommonLanguage"/>
-	<classpathentry kind="output" path="bin/default"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/LARAI/.project b/LARAI/.project
@@ -10,16 +10,10 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.apache.ivyde.eclipse.ivynature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>
 		<filter>

diff --git 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: []
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
@@ -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
@@ -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
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin/main" path="src-java">
+	<classpathentry kind="src" path="src-java"/>
+	<classpathentry kind="src" path="src-lara"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
+			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="bin/main" path="src-lara">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=LaraApi&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/LaraUtils"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/SpecsUtils"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/CommonsLangPlus"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Gprofer"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/XStreamPlus"/>
-	<classpathentry kind="output" path="bin/default"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/LaraApi/.project b/LaraApi/.project
@@ -10,16 +10,10 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.apache.ivyde.eclipse.ivynature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>
 		<filter>

diff --git a/WeaverGenerator/.classpath b/WeaverGenerator/.classpath
@@ -19,5 +19,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/GuiHelper"/>
 	<classpathentry kind="src" path="/jOptions"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/LARAI"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=WeaverGenerator&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>