Repository: flex-falcon Updated Branches: refs/heads/feature/maven-migration 9759a0bca -> 1c93c278e
- Renamed the maven artifacts - Renamed the compiler.jx module directory to compiler-jx - Added some Null checks to the maven-plugins to give sensible error messages if a requested tool-group is not available Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/1c93c278 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/1c93c278 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/1c93c278 Branch: refs/heads/feature/maven-migration Commit: 1c93c278efa264ce0a7635809dfe19c77ac9d695 Parents: 9759a0b Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Tue Mar 29 16:33:53 2016 +0200 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Tue Mar 29 16:33:53 2016 +0200 ---------------------------------------------------------------------- migrate-to-maven.sh | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1c93c278/migrate-to-maven.sh ---------------------------------------------------------------------- diff --git a/migrate-to-maven.sh b/migrate-to-maven.sh index 9dd4cff..c1e205d 100755 --- a/migrate-to-maven.sh +++ b/migrate-to-maven.sh @@ -105,34 +105,27 @@ rm -r compiler.js ############################################# ## Convert the compiler.jx module ############################################# -mkdir -p compiler.jx/src/main/java -mkdir -p compiler.jx/src/main/resources +mkdir -p compiler-jx/src/main/java +mkdir -p compiler-jx/src/main/resources # Move the scripts -mkdir -p compiler.jx/src/assembly/scripts -git mv compiler.jx/bin/* compiler.jx/src/assembly/scripts +mkdir -p compiler-jx/src/assembly/scripts +git mv compiler.jx/bin/* compiler-jx/src/assembly/scripts rm compiler.jx/bin -git mv compiler.jx/src/META-INF compiler.jx/src/main/resources -git mv compiler.jx/src/com compiler.jx/src/main/java -git mv compiler.jx/src/org compiler.jx/src/main/java +git mv compiler.jx/src/META-INF compiler-jx/src/main/resources +git mv compiler.jx/src/com compiler-jx/src/main/java +git mv compiler.jx/src/org compiler-jx/src/main/java # compiler.jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/Notes_JSFlexJSEmitter.txt -# Move the tests from the separate project into the compiler.jx project -mkdir -p compiler.jx/src/test/java -git mv compiler.jx.tests/src/org compiler.jx/src/test/java +# Move the tests from the separate project into the compiler-jx project +mkdir -p compiler-jx/src/test/java +git mv compiler.jx.tests/src/org compiler-jx/src/test/java # Remove the duplicate EnvProperties -git rm -r compiler.jx.tests/src/org compiler.jx/src/test/java/org/apache/flex/utils -mkdir -p compiler.jx/src/test/resources -git mv compiler.jx.tests/test-files/* compiler.jx/src/test/resources +git rm -r compiler.jx.tests/src/org compiler-jx/src/test/java/org/apache/flex/utils +mkdir -p compiler-jx/src/test/resources +git mv compiler.jx.tests/test-files/* compiler-jx/src/test/resources # Clean up -rm -r compiler.jx/in -rm -r compiler.jx/lib -git rm -r compiler.jx/templ -rm compiler.jx/.classpath -rm compiler.jx/.project -git rm -r compiler.jx/build.xml -git rm -r compiler.jx/downloads.xml -git rm -r compiler.jx/local-template.properties +git rm -r compiler.jx git rm -r compiler.jx.tests rm -r compiler.jx.tests @@ -193,8 +186,6 @@ git rm FalconJXFormat.xml git rm build.xml git rm build.properties git rm releasecandidate.xml -rm -r compiler.jx/bin -rm -r compiler.jx/temp rm -r compiler/temp rm -r compiler/results git rm -r compiler/dist