Skip to content
Snippets Groups Projects
Commit 42c7f1ce authored by Daniel Stonier's avatar Daniel Stonier
Browse files

cleanup from bad merge.

parents 96923a9c e6498f17
No related branches found
No related tags found
No related merge requests found
...@@ -21,11 +21,13 @@ ...@@ -21,11 +21,13 @@
<build_depend>python-catkin-pkg</build_depend> <build_depend>python-catkin-pkg</build_depend>
<build_depend>python-rospkg</build_depend> <build_depend>python-rospkg</build_depend>
<build_depend>rosjava_bootstrap</build_depend> <build_depend>rosjava_bootstrap</build_depend>
<build_depend>rosjava_build_tools</build_depend>
<run_depend>genmsg</run_depend> <run_depend>genmsg</run_depend>
<run_depend>python-catkin-pkg</run_depend> <run_depend>python-catkin-pkg</run_depend>
<run_depend>python-rospkg</run_depend> <run_depend>python-rospkg</run_depend>
<run_depend>rosjava_bootstrap</run_depend> <run_depend>rosjava_bootstrap</run_depend>
<run_depend>rosjava_build_tools</run_depend>
<export> <export>
<message_generator>java</message_generator> <message_generator>java</message_generator>
......
File added
#Wed Mar 19 17:27:39 KST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
#!/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 "$@"
...@@ -42,7 +42,6 @@ def author_name(): ...@@ -42,7 +42,6 @@ def author_name():
return name return name
import subprocess
import tarfile import tarfile
...@@ -51,13 +50,6 @@ def create_gradle_wrapper(repo_path): ...@@ -51,13 +50,6 @@ def create_gradle_wrapper(repo_path):
archive = tarfile.open(archive_file) archive = tarfile.open(archive_file)
archive.extractall(path=repo_path) archive.extractall(path=repo_path)
archive.close() archive.close()
# gradle_binary = os.path.join(os.path.dirname(__file__), 'gradle', 'gradlew')
# cmd = [gradle_binary, '-p', repo_path, 'wrapper']
# print("Creating gradle wrapper: %s" % ' '.join(cmd))
# try:
# subprocess.check_call(cmd)
# except subprocess.CalledProcessError:
# raise subprocess.CalledProcessError("failed to create the gradle wrapper.")
def read_template(tmplf): def read_template(tmplf):
...@@ -143,7 +135,6 @@ def create(msg_pkg_name, output_dir): ...@@ -143,7 +135,6 @@ def create(msg_pkg_name, output_dir):
''' '''
Creates a standalone single project gradle build instance in the specified output directory and Creates a standalone single project gradle build instance in the specified output directory and
populates it with gradle wrapper and build.gradle file that will enable building of the artifact later. populates it with gradle wrapper and build.gradle file that will enable building of the artifact later.
:param str project_name: :param str project_name:
:param dict msg_package_index: { name : catkin_pkg.Package } :param dict msg_package_index: { name : catkin_pkg.Package }
:param str output_dir: :param str output_dir:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment