Skip to content

Commit

Permalink
Merge branch 'staging' of github.com:specs-feup/clava
Browse files Browse the repository at this point in the history
  • Loading branch information
joaobispo committed Mar 17, 2024
2 parents 396fd45 + 4eb0643 commit 86e3af5
Show file tree
Hide file tree
Showing 22 changed files with 286 additions and 38 deletions.
43 changes: 43 additions & 0 deletions AntarexClavaApi/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
plugins {
id 'distribution'
}

// Java project
apply plugin: 'java'

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}


// Repositories providers
repositories {
mavenCentral()
}

dependencies {
testImplementation "junit:junit:4.11"
implementation ':SpecsUtils'
implementation ':LaraUtils'
}

java {
withSourcesJar()
}


// Project sources
sourceSets {
main {
java {
srcDir 'src-java'
}

resources {
srcDir 'src-lara'
srcDir 'src-js'
}
}

}
5 changes: 5 additions & 0 deletions AntarexClavaApi/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
rootProject.name = 'AntarexClavaApi'

includeBuild("../../specs-java-libs/SpecsUtils")

includeBuild("../../lara-framework/LaraUtils")
1 change: 1 addition & 0 deletions ClangAstParser/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test-experimental"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
Expand Down
3 changes: 2 additions & 1 deletion ClangAstParser/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repositories {
}

dependencies {
testImplementation "junit:junit:4.11"
implementation "junit:junit:4.11"

implementation ":ClavaAst"
implementation ":CommonsLangPlus"
Expand All @@ -36,6 +36,7 @@ sourceSets {
main {
java {
srcDir 'src'
srcDir 'test'
}

resources {
Expand Down
1 change: 0 additions & 1 deletion ClavaHls/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Clava&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry combineaccessrules="false" kind="src" path="/GsonPlus"/>
<classpathentry combineaccessrules="false" kind="src" path="/SpecsUtils"/>
<classpathentry combineaccessrules="false" kind="src" path="/jOptions"/>
Expand Down
1 change: 0 additions & 1 deletion ClavaHls/.project
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.apache.ivyde.eclipse.ivynature</nature>
</natures>
<filteredResources>
<filter>
Expand Down
44 changes: 44 additions & 0 deletions ClavaHls/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
plugins {
id 'distribution'
}

// Java project
apply plugin: 'java'

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}


// Repositories providers
repositories {
mavenCentral()
}

dependencies {
testImplementation "junit:junit:4.11"
implementation ':SpecsUtils'
implementation ':GitPlus'
implementation ':GsonPlus'
implementation ':jOptions'
implementation ':tdrcLibrary'
implementation ':ClavaAst'

}

java {
withSourcesJar()
}


// Project sources
sourceSets {
main {
java {
srcDir 'src'
}

}

}
31 changes: 0 additions & 31 deletions ClavaHls/ivy.xml

This file was deleted.

9 changes: 9 additions & 0 deletions ClavaHls/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
rootProject.name = 'ClavaHls'

includeBuild("../../specs-java-libs/SpecsUtils")
includeBuild("../../specs-java-libs/GitPlus")
includeBuild("../../specs-java-libs/GsonPlus")
includeBuild("../../specs-java-libs/jOptions")
includeBuild("../../specs-java-libs/tdrcLibrary")

includeBuild("../../clava/ClavaAst")
2 changes: 1 addition & 1 deletion ClavaLaraApi/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ClavaLaraApi&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry combineaccessrules="false" kind="src" path="/LaraApi"/>
<classpathentry combineaccessrules="false" kind="src" path="/SpecsUtils"/>
<classpathentry combineaccessrules="false" kind="src" path="/LaraUtils"/>
<classpathentry combineaccessrules="false" kind="src" path="/ClavaAst"/>
<classpathentry combineaccessrules="false" kind="src" path="/CommonsLangPlus"/>
<classpathentry combineaccessrules="false" kind="src" path="/JacksonPlus"/>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ClavaLaraApi&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry kind="output" path="bin"/>
</classpath>
51 changes: 51 additions & 0 deletions ClavaLaraApi/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
plugins {
id 'distribution'
}

// Java project
apply plugin: 'java'

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}


// Repositories providers
repositories {
mavenCentral()
}

dependencies {
testImplementation "junit:junit:4.11"

implementation ':SpecsUtils'
implementation ':CommonsLangPlus'
implementation ':JacksonPlus'
implementation ':LaraApi'
implementation ':LaraUtils'
implementation ':ClavaAst'

implementation group: 'com.google.code.gson', name: 'gson', version: '2.4'
}

java {
withSourcesJar()
}


// Project sources
sourceSets {
main {
java {
srcDir 'src-java'
}

resources {
srcDir 'src-lara'
srcDir 'src-lara-clava'
srcDir 'src-js'
}

}
}
10 changes: 10 additions & 0 deletions ClavaLaraApi/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
rootProject.name = 'ClavaLaraApi'

includeBuild("../../specs-java-libs/CommonsLangPlus")
includeBuild("../../specs-java-libs/JacksonPlus")
includeBuild("../../specs-java-libs/SpecsUtils")

includeBuild("../../lara-framework/LaraApi")
includeBuild("../../lara-framework/LaraUtils")

includeBuild("../../clava/ClavaAst")
8 changes: 6 additions & 2 deletions ClavaWeaver/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test-experimental"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
Expand All @@ -9,6 +10,9 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ClavaWeaver&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry combineaccessrules="false" kind="src" path="/tdrcLibrary"/>
<classpathentry combineaccessrules="false" kind="src" path="/AntarexClavaApi"/>
<classpathentry combineaccessrules="false" kind="src" path="/LaraCommonLanguageApi"/>
<classpathentry combineaccessrules="false" kind="src" path="/LaraFramework"/>
<classpathentry combineaccessrules="false" kind="src" path="/LaraLoc"/>
Expand All @@ -18,7 +22,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/XStreamPlus"/>
<classpathentry combineaccessrules="false" kind="src" path="/LaraDoc"/>
<classpathentry combineaccessrules="false" kind="src" path="/LaraExtraApi"/>
<classpathentry combineaccessrules="false" kind="src" path="/AntarexClavaApi"/>
<classpathentry combineaccessrules="false" kind="src" path="/CommonsLangPlus"/>
<classpathentry combineaccessrules="false" kind="src" path="/ClavaLaraApi"/>
<classpathentry combineaccessrules="false" kind="src" path="/jOptions"/>
Expand All @@ -29,6 +32,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/ClangAstParser"/>
<classpathentry combineaccessrules="false" kind="src" path="/LanguageSpecification"/>
<classpathentry kind="src" path="/ClavaHls"/>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ClavaWeaver&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry combineaccessrules="false" kind="src" path="/LaraUtils"/>
<classpathentry combineaccessrules="false" kind="src" path="/JsEngine"/>
<classpathentry kind="output" path="bin"/>
</classpath>
84 changes: 84 additions & 0 deletions ClavaWeaver/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
plugins {
id 'distribution'
}

// Java project
apply plugin: 'java'

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}


// Repositories providers
repositories {
// Gearman
maven { url "https://oss.sonatype.org/content/repositories/snapshots"}

mavenCentral()
}

dependencies {
implementation "junit:junit:4.12"


implementation ":CommonsLangPlus"
implementation ":GsonPlus"
implementation ":jOptions"
implementation ":JsEngine"
implementation ":SpecsUtils"
implementation ":XStreamPlus"
implementation ":tdrcLibrary"

implementation ":LanguageSpecification"
implementation ":LaraCommonLanguageApi"
implementation ":LaraDoc"
implementation ":LaraExtraApi"
implementation ":LaraFramework"
implementation ":LARAI"
implementation ":LaraLoc"
implementation ":LaraUnit"
implementation ":LaraUtils"
implementation ":WeaverGenerator"
implementation ":WeaverInterface"

implementation ":AntarexClavaApi"
implementation ":ClangAstParser"
implementation ":ClavaAst"
implementation ":ClavaHls"
implementation ":ClavaLaraApi"

implementation group: 'com.google.guava', name: 'guava', version: '19.0'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.4'
}

java {
withSourcesJar()
}

// Project sources
sourceSets {
main {
java {
srcDir 'src'
srcDir 'test'
}

resources {
srcDir 'resources'
}
}


test {
java {
srcDir 'test'
}

resources {
srcDir 'resources'
}
}

}
1 change: 1 addition & 0 deletions ClavaWeaver/ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
</info>

<dependencies>
<dependency org="com.google.code.gson" name="gson" rev="2.4"/>
<dependency org="com.google.guava" name="guava" rev="19.0"/>
</dependencies>
</ivy-module>
Loading

0 comments on commit 86e3af5

Please sign in to comment.