diff --git a/.gitignore b/.gitignore index 8789cea..783f9d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ .DS_Store .gradle -**/build/ +build/ diff --git a/README.md b/README.md index 7b059a9..d21ecdd 100644 --- a/README.md +++ b/README.md @@ -144,8 +144,6 @@ because gradle is using "Build by convention". No further configuration is needed. Gradle is able to determine compiler chain and use available compiler, e.g. g++ or Visual Studio. -Note for Visual Studio 2013: Use Gradle at least night build 1.10-20131122230018 - How to run: cd gradle-cpp-plugin/01-hello-muni @@ -173,7 +171,6 @@ How to run: ### 03-hello-muni-with-debug ### -Current implementation of C++ support in Gradle is in early stage, but it's very promising. This example shows how to update build script to add debug flags for compilers like GCC or VS. How to run: diff --git a/gradle/00-empty-project/build.gradle b/gradle-c-plugin/00-empty-project/build.gradle similarity index 100% rename from gradle/00-empty-project/build.gradle rename to gradle-c-plugin/00-empty-project/build.gradle diff --git a/gradle/01-hello-task/build.gradle b/gradle-c-plugin/01-hello-task/build.gradle similarity index 100% rename from gradle/01-hello-task/build.gradle rename to gradle-c-plugin/01-hello-task/build.gradle diff --git a/gradle/02-c-plugin/build.gradle b/gradle-c-plugin/02-c-plugin/build.gradle similarity index 100% rename from gradle/02-c-plugin/build.gradle rename to gradle-c-plugin/02-c-plugin/build.gradle diff --git a/gradle/03-executable/build.gradle b/gradle-c-plugin/03-executable/build.gradle similarity index 100% rename from gradle/03-executable/build.gradle rename to gradle-c-plugin/03-executable/build.gradle diff --git a/gradle/03-executable/src/main/c/hello.c b/gradle-c-plugin/03-executable/src/main/c/hello.c similarity index 100% rename from gradle/03-executable/src/main/c/hello.c rename to gradle-c-plugin/03-executable/src/main/c/hello.c diff --git a/gradle/04-visual-studio/build.gradle b/gradle-c-plugin/04-visual-studio/build.gradle similarity index 100% rename from gradle/04-visual-studio/build.gradle rename to gradle-c-plugin/04-visual-studio/build.gradle diff --git a/gradle/04-visual-studio/src/main/c/hello.c b/gradle-c-plugin/04-visual-studio/src/main/c/hello.c similarity index 100% rename from gradle/04-visual-studio/src/main/c/hello.c rename to gradle-c-plugin/04-visual-studio/src/main/c/hello.c diff --git a/gradle/05-debian-package/build.gradle b/gradle-c-plugin/05-debian-package/build.gradle similarity index 100% rename from gradle/05-debian-package/build.gradle rename to gradle-c-plugin/05-debian-package/build.gradle diff --git a/gradle/05-debian-package/src/hello/c/hello.c b/gradle-c-plugin/05-debian-package/src/hello/c/hello.c similarity index 100% rename from gradle/05-debian-package/src/hello/c/hello.c rename to gradle-c-plugin/05-debian-package/src/hello/c/hello.c diff --git a/gradle/05-debian-package/src/main/resources/control/conffiles b/gradle-c-plugin/05-debian-package/src/main/resources/control/conffiles similarity index 100% rename from gradle/05-debian-package/src/main/resources/control/conffiles rename to gradle-c-plugin/05-debian-package/src/main/resources/control/conffiles diff --git a/gradle/05-debian-package/src/main/resources/control/control b/gradle-c-plugin/05-debian-package/src/main/resources/control/control similarity index 100% rename from gradle/05-debian-package/src/main/resources/control/control rename to gradle-c-plugin/05-debian-package/src/main/resources/control/control diff --git a/gradle/05-debian-package/src/main/resources/control/postinst b/gradle-c-plugin/05-debian-package/src/main/resources/control/postinst similarity index 100% rename from gradle/05-debian-package/src/main/resources/control/postinst rename to gradle-c-plugin/05-debian-package/src/main/resources/control/postinst diff --git a/gradle/05-debian-package/src/main/resources/control/postrm b/gradle-c-plugin/05-debian-package/src/main/resources/control/postrm similarity index 100% rename from gradle/05-debian-package/src/main/resources/control/postrm rename to gradle-c-plugin/05-debian-package/src/main/resources/control/postrm diff --git a/gradle/05-debian-package/src/main/resources/control/prerm b/gradle-c-plugin/05-debian-package/src/main/resources/control/prerm similarity index 100% rename from gradle/05-debian-package/src/main/resources/control/prerm rename to gradle-c-plugin/05-debian-package/src/main/resources/control/prerm diff --git a/gradle/05-debian-package/src/main/resources/txt/changelog.txt b/gradle-c-plugin/05-debian-package/src/main/resources/txt/changelog.txt similarity index 100% rename from gradle/05-debian-package/src/main/resources/txt/changelog.txt rename to gradle-c-plugin/05-debian-package/src/main/resources/txt/changelog.txt diff --git a/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties b/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties index 2b56de8..a7795d3 100644 --- a/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties +++ b/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions-snapshots/gradle-1.10-20131122230018+0000-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-bin.zip