diff --git a/.gitignore b/.gitignore index 47b6f4b..3d507d9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,9 @@ src/*/.settings src/*/.project src/*/target src/*/bin +src/.gradle +src/build +src/*/build src/com.logicalhacking.dasca.dataflow/config/main.config src/com.logicalhacking.dasca.dataflow/main.log* src/com.logicalhacking.dasca.crosslanguage/BuildCordovaCallgraph.launch diff --git a/src/build.gradle b/src/build.gradle new file mode 100644 index 0000000..4ac17a7 --- /dev/null +++ b/src/build.gradle @@ -0,0 +1,26 @@ +allprojects { + apply plugin: 'maven' + + group = 'com.logicalhacking.dasca' + version = '0.1' +} + + + +subprojects { + apply plugin: 'java' + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } + + + repositories { + mavenLocal() + maven { url "http://repo.maven.apache.org/maven2" } + flatDir { dirs "$rootProject.projectDir/libs" } + } + + +} diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/build.gradle b/src/com.logicalhacking.dasca.crosslanguage.test/build.gradle new file mode 100644 index 0000000..c04b432 --- /dev/null +++ b/src/com.logicalhacking.dasca.crosslanguage.test/build.gradle @@ -0,0 +1,19 @@ + +description = 'com.logicalhacking.dasca.crosslanguage.test' +dependencies { + compile group: 'com.google.collections', name: 'google-collections', version:'1.0-rc2' + compile group: 'org.mozilla', name: 'rhino', version:'1.7.6' + compile group: 'org.smali', name: 'dexlib2', version:'2.2.1' + compile group: 'net.htmlparser.jericho', name: 'jericho-html', version:'3.2' + compile group: 'org.scala-lang', name: 'scala-library', version:'2.11.6' + compile group: 'commons-io', name: 'commons-io', version:'2.4' + compile group: 'apktool', name: 'apktool', version:'2.3.0' + compile group: 'io.spray', name: 'spray-json_2.11', version:'1.3.2' + compile group: 'com.typesafe.scala-logging', name: 'scala-logging_2.11', version:'3.1.0' + compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.3' + compile group: 'org.scala-lang.modules', name: 'scala-xml_2.11', version:'1.0.4' + compile group: 'com.google.code.gson', name: 'gson', version:'2.3.1' + compile group: 'junit', name: 'junit', version:'4.12' + compile group: 'org.scalatest', name: 'scalatest_2.11', version:'3.0.0' + compile project(':com.logicalhacking.dasca.crosslanguage') +} diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/pom.xml b/src/com.logicalhacking.dasca.crosslanguage.test/pom.xml deleted file mode 100644 index c48c753..0000000 --- a/src/com.logicalhacking.dasca.crosslanguage.test/pom.xml +++ /dev/null @@ -1,259 +0,0 @@ - - - 4.0.0 - - com.logicalhacking.dasca - com.logicalhacking.dasca.parent - 0.1 - ../com.logicalhacking.dasca.parent/pom.xml - - com.logicalhacking.dasca.crosslanguage.test - 0.0.1-SNAPSHOT - ${project.artifactId} - jar - - - com.google.collections - google-collections - 1.0-rc2 - - - org.mozilla - rhino - 1.7.6 - - - org.smali - dexlib2 - 2.2.1 - - - net.htmlparser.jericho - jericho-html - 3.2 - - - org.scala-lang - scala-library - 2.11.6 - - - commons-io - commons-io - 2.4 - - - apktool - apktool - 2.3.0 - - - io.spray - spray-json_2.11 - 1.3.2 - - - com.typesafe.scala-logging - scala-logging_2.11 - 3.1.0 - - - ch.qos.logback - logback-classic - 1.1.3 - - - org.scala-lang.modules - scala-xml_2.11 - 1.0.4 - - - com.google.code.gson - gson - 2.3.1 - - - com.ibm.wala - com.ibm.wala.core - ${wala.version} - - - com.ibm.wala - com.ibm.wala.shrike - ${wala.version} - - - com.ibm.wala - com.ibm.wala.util - ${wala.version} - - - com.ibm.wala - com.ibm.wala.cast - ${wala.version} - - - com.ibm.wala - com.ibm.wala.cast.js - ${wala.version} - - - com.ibm.wala - com.ibm.wala.cast.js.rhino - ${wala.version} - - - com.ibm.wala - com.ibm.wala.dalvik - ${wala.version} - - - com.logicalhacking.dasca - com.logicalhacking.dasca.crosslanguage - 0.0.1-SNAPSHOT - - - junit - junit - 4.12 - - - org.scalatest - scalatest_2.11 - 3.0.0 - - - - - - maven-antrun-plugin - 1.7 - - - - - - - - generate-resources - - run - - - - - - net.alchim31.maven - scala-maven-plugin - 3.2.1 - - - - compile - testCompile - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.10 - - true - true - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - org.scala-ide.sdt.core.scalabuilder - - - org.scala-ide.sdt.launching.SCALA_CONTAINER - org.eclipse.jdt.launching.JRE_CONTAINER - - - org.scala-lang:scala-library - org.scala-lang:scala-compiler - - - **/*.scala - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - src/main/scala - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4 - - - package - - shade - - - - - com.logicalhacking.dasca.crosslanguage.Main - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-antrun-plugin - - [1.7,) - - run - - - - - - - - - - - - - - diff --git a/src/com.logicalhacking.dasca.crosslanguage/build.gradle b/src/com.logicalhacking.dasca.crosslanguage/build.gradle new file mode 100644 index 0000000..33744ed --- /dev/null +++ b/src/com.logicalhacking.dasca.crosslanguage/build.gradle @@ -0,0 +1,19 @@ + +description = 'com.logicalhacking.dasca.crosslanguage' +dependencies { + compile group: 'org.scala-lang', name: 'scala-library', version:'2.11.6' + compile group: 'commons-io', name: 'commons-io', version:'2.4' + compile group: 'apktool', name: 'apktool', version:'2.3.0' + compile group: 'io.spray', name: 'spray-json_2.11', version:'1.3.2' + compile group: 'com.typesafe.scala-logging', name: 'scala-logging_2.11', version:'3.1.0' + compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.3' + compile group: 'org.scala-lang.modules', name: 'scala-xml_2.11', version:'1.0.4' + compile group: 'com.google.code.gson', name: 'gson', version:'2.3.1' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.core' , version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.shrike' , version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.util' , version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.cast' , version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.cast.js' , version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.cast.js.rhino' , version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.dalvik' , version:'1.5.1-SNAPSHOT-DASCA' +} diff --git a/src/com.logicalhacking.dasca.crosslanguage/pom.xml b/src/com.logicalhacking.dasca.crosslanguage/pom.xml deleted file mode 100644 index eaa2a5c..0000000 --- a/src/com.logicalhacking.dasca.crosslanguage/pom.xml +++ /dev/null @@ -1,223 +0,0 @@ - - - 4.0.0 - - com.logicalhacking.dasca - com.logicalhacking.dasca.parent - 0.1 - ../com.logicalhacking.dasca.parent/pom.xml - - com.logicalhacking.dasca.crosslanguage - 0.0.1-SNAPSHOT - ${project.artifactId} - jar - - - org.scala-lang - scala-library - 2.11.6 - - - commons-io - commons-io - 2.4 - - - apktool - apktool - 2.3.0 - - - io.spray - spray-json_2.11 - 1.3.2 - - - com.typesafe.scala-logging - scala-logging_2.11 - 3.1.0 - - - ch.qos.logback - logback-classic - 1.1.3 - - - org.scala-lang.modules - scala-xml_2.11 - 1.0.4 - - - com.google.code.gson - gson - 2.3.1 - - - com.ibm.wala - com.ibm.wala.core - ${wala.version} - - - com.ibm.wala - com.ibm.wala.shrike - ${wala.version} - - - com.ibm.wala - com.ibm.wala.util - ${wala.version} - - - com.ibm.wala - com.ibm.wala.cast - ${wala.version} - - - com.ibm.wala - com.ibm.wala.cast.js - ${wala.version} - - - com.ibm.wala - com.ibm.wala.cast.js.rhino - ${wala.version} - - - com.ibm.wala - com.ibm.wala.dalvik - ${wala.version} - - - - - - maven-antrun-plugin - 1.7 - - - - - - - - generate-resources - - run - - - - - - net.alchim31.maven - scala-maven-plugin - 3.2.1 - - - - compile - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.10 - - true - true - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - org.scala-ide.sdt.core.scalabuilder - - - org.scala-ide.sdt.launching.SCALA_CONTAINER - org.eclipse.jdt.launching.JRE_CONTAINER - - - org.scala-lang:scala-library - org.scala-lang:scala-compiler - - - **/*.scala - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - src/main/scala - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4 - - - package - - shade - - - - - com.logicalhacking.dasca.crosslanguage.Main - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-antrun-plugin - - [1.7,) - - run - - - - - - - - - - - - - - diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/build.gradle b/src/com.logicalhacking.dasca.dataflow.test.data/build.gradle new file mode 100644 index 0000000..986ea84 --- /dev/null +++ b/src/com.logicalhacking.dasca.dataflow.test.data/build.gradle @@ -0,0 +1,2 @@ + +description = 'DASCA - Dataflow Test Data' diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/pom.xml b/src/com.logicalhacking.dasca.dataflow.test.data/pom.xml deleted file mode 100644 index bd278c0..0000000 --- a/src/com.logicalhacking.dasca.dataflow.test.data/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - com.logicalhacking.dasca - com.logicalhacking.dasca.parent - 0.1 - ../com.logicalhacking.dasca.parent/pom.xml - - com.logicalhacking.dasca.dataflow.test.data - jar - DASCA - Dataflow Test Data - - src/main/java - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - - - - - diff --git a/src/com.logicalhacking.dasca.dataflow/build.gradle b/src/com.logicalhacking.dasca.dataflow/build.gradle new file mode 100644 index 0000000..bd62ce7 --- /dev/null +++ b/src/com.logicalhacking.dasca.dataflow/build.gradle @@ -0,0 +1,15 @@ + +description = 'com.logicalhacking.dasca.dataflow' + +dependencies { + compile group: 'com.ibm.wala', name: 'com.ibm.wala.core', version: '1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.shrike', version: '1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.util', version: '1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.cast', version: '1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.cast.java', version: '1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.cast.java.ecj', version: '1.5.1-SNAPSHOT-DASCA' + compile group: 'junit', name: 'junit', version:'4.12' + compile group: 'log4j', name: 'log4j', version:'1.2.17' + compile name: 'libcvc3-5.0.0' +} + diff --git a/src/com.logicalhacking.dasca.dataflow/pom.xml b/src/com.logicalhacking.dasca.dataflow/pom.xml deleted file mode 100644 index cbccb2e..0000000 --- a/src/com.logicalhacking.dasca.dataflow/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - com.logicalhacking.dasca - com.logicalhacking.dasca.parent - 0.1 - ../com.logicalhacking.dasca.parent/pom.xml - - com.logicalhacking.dasca.dataflow - 0.1.0 - DASCA - Dataflow Analysis - - - cvc3 - cvc3 - 1.0 - system - ${project.basedir}/lib/libcvc3-5.0.0.jar - - - com.ibm.wala - com.ibm.wala.core - ${wala.version} - - - com.ibm.wala - com.ibm.wala.shrike - ${wala.version} - - - com.ibm.wala - com.ibm.wala.util - ${wala.version} - - - com.ibm.wala - com.ibm.wala.cast - ${wala.version} - - - com.ibm.wala - com.ibm.wala.cast.java - ${wala.version} - - - com.ibm.wala - com.ibm.wala.cast.java.ecj - ${wala.version} - - - junit - junit - 4.12 - - - log4j - log4j - 1.2.17 - - - - src/main/java - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - - - - - diff --git a/src/com.logicalhacking.dasca.js/build.gradle b/src/com.logicalhacking.dasca.js/build.gradle new file mode 100644 index 0000000..dcc4ced --- /dev/null +++ b/src/com.logicalhacking.dasca.js/build.gradle @@ -0,0 +1,10 @@ + +description = 'com.logicalhacking.dasca.js' +dependencies { + compile group: 'com.ibm.wala', name: 'com.ibm.wala.core', version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.cast', version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.cast.js', version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.cast.js.rhino', version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.util', version:'1.5.1-SNAPSHOT-DASCA' + compile group: 'com.ibm.wala', name: 'com.ibm.wala.shrike', version:'1.5.1-SNAPSHOT-DASCA' +} diff --git a/src/com.logicalhacking.dasca.js/pom.xml b/src/com.logicalhacking.dasca.js/pom.xml deleted file mode 100644 index 0df7cef..0000000 --- a/src/com.logicalhacking.dasca.js/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - com.logicalhacking.dasca - com.logicalhacking.dasca.parent - 0.1 - ../com.logicalhacking.dasca.parent/pom.xml - - com.logicalhacking.dasca.js - 0.1.0 - jar - DASCA - JavaScript Analysis - - - com.ibm.wala - ${wala.version} - com.ibm.wala.core - - - com.ibm.wala - ${wala.version} - com.ibm.wala.cast - - - com.ibm.wala - ${wala.version} - com.ibm.wala.cast.js - - - com.ibm.wala - ${wala.version} - com.ibm.wala.cast.js.rhino - - - com.ibm.wala - ${wala.version} - com.ibm.wala.util - - - com.ibm.wala - ${wala.version} - com.ibm.wala.shrike - - - diff --git a/src/com.logicalhacking.dasca.parent/pom.xml b/src/com.logicalhacking.dasca.parent/pom.xml deleted file mode 100644 index 8303242..0000000 --- a/src/com.logicalhacking.dasca.parent/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - 4.0.0 - com.logicalhacking.dasca - com.logicalhacking.dasca.parent - 0.1 - pom - DASCA - Parent project - - 0.23.1 - UTF-8 - 1.4.4-SNAPSHOT - - - - dasca - - true - - - ../com.logicalhacking.dasca.dataflow - ../com.logicalhacking.dasca.dataflow.test.data - ../com.logicalhacking.dasca.js - ../com.logicalhacking.dasca.crosslanguage - ../com.logicalhacking.dasca.crosslanguage.test - - - - wala - - ../../externals/WALA/ - - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.9 - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - p2 - - - - - - diff --git a/src/gradle/wrapper/gradle-wrapper.jar b/src/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..758de96 Binary files /dev/null and b/src/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/gradle/wrapper/gradle-wrapper.properties b/src/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..bd24854 --- /dev/null +++ b/src/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip diff --git a/src/gradlew b/src/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/src/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/src/gradlew.bat b/src/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/src/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/com.logicalhacking.dasca.dataflow/lib/libcvc3-5.0.0.jar b/src/libs/libcvc3-5.0.0.jar similarity index 100% rename from src/com.logicalhacking.dasca.dataflow/lib/libcvc3-5.0.0.jar rename to src/libs/libcvc3-5.0.0.jar diff --git a/src/settings.gradle b/src/settings.gradle new file mode 100644 index 0000000..1172cd1 --- /dev/null +++ b/src/settings.gradle @@ -0,0 +1,11 @@ +rootProject.name = 'com.logicalhacking.dasca' + +include ( + 'com.logicalhacking.dasca.crosslanguage', + 'com.logicalhacking.dasca.crosslanguage.test', + 'com.logicalhacking.dasca.dataflow', + 'com.logicalhacking.dasca.dataflow.test.data', + 'com.logicalhacking.dasca.js', +) + +