Skip to content

Commit

Permalink
Move Proxl to build with Gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
@danjasuw
danjasuw committed Nov 19, 2018
1 parent 6c2440f commit 0ec6d00
Show file tree
Hide file tree
Showing 1,879 changed files with 2,852 additions and 270 deletions.
10 changes: 10 additions & 0 deletions aa_ant__build_all_proxl_config.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

# Copy to filename aa_ant__build_all_proxl_config.properties

# and update the properties below

# Configuration for ant__build_all_proxl.xml

# Path to gradle executable

gradle.wrapper.executable=/opt/gradle/gradle-4.5/bin/gradle
13 changes: 13 additions & 0 deletions aa_ant__build_all_proxl_config.properties_Sample
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

# Copy to filename aa_ant__build_all_proxl_config.properties

# and update the properties below

# Configuration for ant__build_all_proxl.xml

# Path to gradle executable

gradle.wrapper.executable=

# possible Linux path (depending on version)
# gradle.wrapper.executable=/opt/gradle/gradle-4.5/bin/gradle
99 changes: 59 additions & 40 deletions ant__build_all_proxl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,46 +14,37 @@
-->


<!-- init depends on nothing -->
<target name="init">
<tstamp />

<!-- name of jar or whatever that is copied to deploy -->

<!-- Properties -->


</target>
<property name="config_file" value="aa_ant__build_all_proxl_config.properties" />

<property name="config_file_with_path"
value="${config_file}"/>

<!-- Not in any 'target' -->

<tstamp prefix="build-info">
<format property="current-date" pattern="d-MMMM-yyyy" locale="en" />
<format property="current-time" pattern="hh:mm:ss a z" locale="en" />
<format property="year-month-day" pattern="yyyy-MM-dd" locale="en" />
</tstamp>

<echo>Using Config file ${config_file_with_path}</echo>

<fail message="ERROR: '${config_file}' file not found, check the path. filename with path: ${config_file_with_path}">
<condition>
<not>
<available file="${config_file_with_path}" />
</not>
</condition>
</fail>

<echo>config_file_with_path: ${config_file_with_path}</echo>

<!-- This does not fail if the file is not found -->
<property file="${config_file_with_path}" />

<echo>gradle.wrapper.executable: ${gradle.wrapper.executable}</echo>


<!-- Clean depends on init -->
<target name="clean" depends="init">
<!-- -->
<target name="clean" >
<delete dir="deploy" />
<delete dir="generated_jars" />
<delete dir="create_installables_work_dir" />

<ant dir="proxl_importer" antfile="ant__create_runnable_jar_main_importer.xml" target="clean" />
<ant dir="proxl_importer" antfile="ant__create_runnable_jar_run_importer.xml" target="clean" />

<ant dir="proxl_submit_import" antfile="ant__create_runnable_jar_submit_import.xml" target="clean" />
<ant dir="proxl_web_app" antfile="ant_build_webapp_war.xml" target="clean" />

</target>



<!-- Prepare depends on clean -->
<target name="prepare" depends="clean">
<mkdir dir="deploy" />
<mkdir dir="create_installables_work_dir" />
</target>

<!--
Expand All @@ -62,11 +53,39 @@
-->
<target name="compileAllSubmodules" depends="prepare">

<ant dir="proxl_importer" antfile="ant__create_runnable_jar_main_importer.xml" />
<ant dir="proxl_importer" antfile="ant__create_runnable_jar_run_importer.xml" />
<!-- Build submodules and create runnable jars -->

<!-- web app -->
<exec executable="${gradle.wrapper.executable}" dir="proxl_web_app" failonerror="true" >
<arg value="build" />
<!-- <arg value="XXXX" /> -->
</exec>

<!-- importer -->
<exec executable="${gradle.wrapper.executable}" dir="proxl_importer" failonerror="true" >
<arg value="build" />
<!-- <arg value="XXXX" /> -->
</exec>
<!-- importer executable jar -->
<ant dir="proxl_importer/build_runnable_jar" antfile="ant__create_runnable_jar_importer.xml" />

<!-- run importer -->
<exec executable="${gradle.wrapper.executable}" dir="proxl_run_importer" failonerror="true" >
<arg value="build" />
<!-- <arg value="XXXX" /> -->
</exec>
<!-- run importer executable jar -->
<ant dir="proxl_run_importer/build_runnable_jar" antfile="ant__create_runnable_jar_run_importer.xml" />

<!-- submit import -->
<exec executable="${gradle.wrapper.executable}" dir="proxl_submit_import" failonerror="true" >
<arg value="build" />
<!-- <arg value="XXXX" /> -->
</exec>
<!-- submit import executable jar -->
<ant dir="proxl_submit_import/build_runnable_jar" antfile="ant__create_runnable_jar_submit_import.xml" />


<ant dir="proxl_submit_import" antfile="ant__create_runnable_jar_submit_import.xml" />
<ant dir="proxl_web_app" antfile="ant_build_webapp_war.xml" />
</target>


Expand All @@ -76,10 +95,10 @@
<target name="createInstallables" depends="compileAllSubmodules">

<!-- copy files from subdir 'deploy' to deploy -->
<copy file="proxl_web_app/deploy/proxl.war" todir="deploy" />
<copy file="proxl_importer/deploy/importProxlXML.jar" todir="deploy" />
<copy file="proxl_importer/deploy_run_importer/runImportProxlXML.jar" todir="deploy" />
<copy file="proxl_submit_import/deploy/submitProxlXMLImport.jar" todir="deploy" />
<copy file="proxl_web_app/build/libs/proxl.war" todir="deploy" />
<copy file="proxl_importer/build_runnable_jar/deploy/importProxlXML.jar" todir="deploy" />
<copy file="proxl_run_importer/build_runnable_jar/deploy/runImportProxlXML.jar" todir="deploy" />
<copy file="proxl_submit_import/build_runnable_jar/deploy/submitProxlXMLImport.jar" todir="deploy" />

</target>

Expand Down
0 proxl_importer/lib/commons-dbcp2-2.1.1.jar → ...orter_shared_code/commons-dbcp2-2.1.1.jar
View file
File renamed without changes.
0 proxl_importer/lib/commons-lang3-3.2.1.jar → ...orter_shared_code/commons-lang3-3.2.1.jar
View file
File renamed without changes.
0 proxl_importer/lib/commons-logging.jar → ..._importer_shared_code/commons-logging.jar
View file
File renamed without changes.
0 proxl_importer/lib/commons-pool2-2.4.2.jar → ...orter_shared_code/commons-pool2-2.4.2.jar
View file
File renamed without changes.
0 ...mporter/lib/jackson-annotations-2.2.3.jar → ...shared_code/jackson-annotations-2.2.3.jar
View file
File renamed without changes.
0 proxl_importer/lib/jackson-core-2.2.3.jar → ...porter_shared_code/jackson-core-2.2.3.jar
View file
File renamed without changes.
0 ...l_importer/lib/jackson-databind-2.2.3.jar → ...er_shared_code/jackson-databind-2.2.3.jar
View file
File renamed without changes.
0 proxl_importer/lib/jargs.jar → ...porter_run_importer_shared_code/jargs.jar
View file
File renamed without changes.
0 proxl_importer/lib/joda-time-2.3.jar → ...un_importer_shared_code/joda-time-2.3.jar
View file
File renamed without changes.
0 proxl_importer/lib/log4j-1.2.15.jar → ...run_importer_shared_code/log4j-1.2.15.jar
View file
File renamed without changes.
0 ...r/lib/mysql-connector-java-5.1.38-bin.jar → ..._code/mysql-connector-java-5.1.38-bin.jar
View file
File renamed without changes.
0 ...orter/lib_proxl_jars/proxl_import_api.jar → libs_proxl_github_jars/proxl_import_api.jar
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions proxl-shared-code/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/.gradle/
/build/
/bin/
/.settings/
.classpath
.project
64 changes: 64 additions & 0 deletions proxl-shared-code/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* Application 'shared-code' folder
*
* This file was generated by the Gradle 'init' task.
*
* This generated file contains a sample Java Library project to get you started.
* For more details take a look at the Java Libraries chapter in the Gradle
* user guide available at https://docs.gradle.org/4.5/userguide/java_library_plugin.html
*/

plugins {
// Apply the java-library plugin to add support for Java Library
id 'java-library'
}

// defaults to currently installed JVM
// sourceCompatibility = 1.8

// defaults to sourceCompatibility
// targetCompatibility = 1.8


dependencies {

// https://mvnrepository.com/artifact/org.slf4j/slf4j-simple
// compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'

// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
// compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'

//////////////////////////////

// Jars copied and placed here
// compile fileTree(dir: 'lib', include: ['*.jar'])

// Jars built from other Emozi Github repositories
// compile fileTree(dir: '../libs_emozi_github_jars', include: ['*.jar'])

// Jars built from other Yeastrc Github repositories
// compile fileTree(dir: '../libs_yeastrc_github_jars', include: ['*.jar'])

/////////////////////////////////////

// Use JUnit test framework
testCompile 'junit:junit:4.12'


// Instead of compile only here, could:
// 1) move these to parent folder and include everywhere
// 2) remove from dependent projects
// 3) May not be a problem when list dependencies here instead of including these jars in this folder

// Jars provided for compiling shared code only
compileOnly fileTree(dir: 'libs_compile_only_other', include: ['*.jar'])


}

// In this section you declare where to find the dependencies of your project
repositories {
// Use jcenter for resolving your dependencies.
// You can declare any Maven/Ivy/file repository here.
jcenter()
}
Binary file added proxl-shared-code/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions proxl-shared-code/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 0ec6d00

Please sign in to comment.