diff --git a/catkin/.classpath b/.classpath
similarity index 72%
rename from catkin/.classpath
rename to .classpath
index 885ee209da733ca070a7b018f1a0ff24a57a6176..89e45cb2049ddf3c2d742d808d7d0f1cd76d5386 100644
--- a/catkin/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="plugin/src/main/groovy"/>
+ <classpathentry kind="lib" path="gradle/wrapper/gradle-wrapper.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/.gitignore b/.gitignore
index 9ef96044faba86acfbf59bd0deb4545625df837f..e0d44a067c555cb29a4351320c4ff670d861807e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+.gradle
build
diff --git a/catkin/.project b/.project
similarity index 90%
rename from catkin/.project
rename to .project
index b25877cb54706207e5b1a1f88182eed0c5a333e5..04ba7243d2f8f73b4b3be134a47f6e5b8b383602 100644
--- a/catkin/.project
+++ b/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>catkin</name>
+ <name>rosjava_gradle_plugins</name>
<comment></comment>
<projects>
</projects>
diff --git a/catkin/build.gradle b/build.gradle
similarity index 85%
rename from catkin/build.gradle
rename to build.gradle
index e1cc8eb5b48076c55d403a390edffd899ad459ff..d8665fe9de86fc1fb0d347cc3bebc6ab0a647c2e 100644
--- a/catkin/build.gradle
+++ b/build.gradle
@@ -1,5 +1,11 @@
+
+task wrapper(type: Wrapper) {
+ gradleVersion = '1.5'
+}
+
apply plugin: 'groovy'
apply plugin: 'maven'
+
dependencies {
compile gradleApi()
groovy localGroovy()
@@ -10,7 +16,7 @@ repositories {
group='com.github.rosjava.rosjava_gradle_plugins'
version='0.1.0-SNAPSHOT'
-
+
uploadArchives {
repositories {
mavenDeployer {
diff --git a/catkin/plugin/src/main/groovy/com/github/rosjava/rosjava_gradle_plugins/catkin/gradle/CatkinPlugin.java b/catkin/plugin/src/main/groovy/com/github/rosjava/rosjava_gradle_plugins/catkin/gradle/CatkinPlugin.java
deleted file mode 100644
index 42e3fa921ea0b8b032078769ee767b51a2285257..0000000000000000000000000000000000000000
--- a/catkin/plugin/src/main/groovy/com/github/rosjava/rosjava_gradle_plugins/catkin/gradle/CatkinPlugin.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.rosjava.rosjava_gradle_plugins.catkin.gradle;
-
-import org.gradle.api.*;
-
-public class CatkinPlugin implements Plugin {
- def void apply(Project project) {
- //c4rTask task has been defined below.
- project.task('catkin') << {
- println "Hi from catkin plugin!"
- }
- }
-}
\ No newline at end of file
diff --git a/catkin/plugin/src/main/resources/META-INF/gradle-plugins/catkin.properties b/catkin/plugin/src/main/resources/META-INF/gradle-plugins/catkin.properties
deleted file mode 100644
index a85d3581299fa7b0347f2fc9d25b1f329db9ce76..0000000000000000000000000000000000000000
--- a/catkin/plugin/src/main/resources/META-INF/gradle-plugins/catkin.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=com.github.rosjava.rosjava_gradle_plugins.catkin.gradle.CatkinPlugin
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..faa569a9a0eedc9ff37450fed24a7efd77a86729
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000000000000000000000000000000000..96ef2a2c1e92f0940083d9a17a3f7c215f009084
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Sep 05 21:39:25 KST 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000000000000000000000000000000000000..91a7e269e19dfc62e27137a0b57ef3e430cee4fd
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# 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\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+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" ] ; 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"`
+
+ # 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
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000000000000000000000000000000000..aec99730b4e8fcd90b57a0e8e01544fea7c31a89
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@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
+
+@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=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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 Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_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=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+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/settings.gradle b/settings.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..28ae37ac15331c8eea3e406badb3054618f14039
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'catkin'
\ No newline at end of file
diff --git a/src/main/groovy/com/github/rosjava/rosjava_gradle_plugins/CatkinPlugin.groovy b/src/main/groovy/com/github/rosjava/rosjava_gradle_plugins/CatkinPlugin.groovy
new file mode 100644
index 0000000000000000000000000000000000000000..dddd267719397ca89e65e3de3bc3953b8c3ecde0
--- /dev/null
+++ b/src/main/groovy/com/github/rosjava/rosjava_gradle_plugins/CatkinPlugin.groovy
@@ -0,0 +1,25 @@
+package com.github.rosjava.rosjava_gradle_plugins;
+
+import org.gradle.api.Project;
+import org.gradle.api.Plugin;
+import org.gradle.api.Task;
+import org.gradle.api.*;
+
+class CatkinPlugin implements Plugin<Project> {
+ def void apply(Project project) {
+ project.ext.ROS_PACKAGE_PATH = "$System.env.ROS_PACKAGE_PATH".split(":")
+ project.ext.ROS_PACKAGE_TREES = []
+ project.ext.ROS_PACKAGE_PATH.each { rosPackageRoot ->
+ println("Ros Package Root: " + rosPackageRoot)
+ def manifestTree = project.fileTree(dir: rosPackageRoot, include: '**/package.xml')
+ manifestTree.each { file ->
+ println("File: " + file)
+ }
+ }
+ println("We are happy, you should be too.")
+ project.task('happy') << {
+ println "I'll teach your grandmother to suck eggs!"
+ println("ROS_PACKAGE_PATH........." + project.ROS_PACKAGE_PATH)
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/gradle-plugins/catkin.properties b/src/main/resources/META-INF/gradle-plugins/catkin.properties
new file mode 100644
index 0000000000000000000000000000000000000000..8030a17921e05ce25f67d845fb338042e9e7f267
--- /dev/null
+++ b/src/main/resources/META-INF/gradle-plugins/catkin.properties
@@ -0,0 +1 @@
+implementation-class=com.github.rosjava.rosjava_gradle_plugins.CatkinPlugin
\ No newline at end of file