Skip to content
This repository was archived by the owner on Jan 14, 2023. It is now read-only.

Commit 42c7f1c

Browse files
stonierstonier
committed
cleanup from bad merge.
2 parents 96923a9 + e6498f1 commit 42c7f1c

File tree

5 files changed

+172
-9
lines changed

5 files changed

+172
-9
lines changed

‎package.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
<build_depend>python-catkin-pkg</build_depend>
2222
<build_depend>python-rospkg</build_depend>
2323
<build_depend>rosjava_bootstrap</build_depend>
24+
<build_depend>rosjava_build_tools</build_depend>
2425

2526
<run_depend>genmsg</run_depend>
2627
<run_depend>python-catkin-pkg</run_depend>
2728
<run_depend>python-rospkg</run_depend>
2829
<run_depend>rosjava_bootstrap</run_depend>
30+
<run_depend>rosjava_build_tools</run_depend>
2931

3032
<export>
3133
<message_generator>java</message_generator>

‎src/genjava/gradle/gradle/wrapper/gradle-wrapper.jar‎

49.9 KB
Binary file not shown.

‎src/genjava/gradle/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Wed Mar 19 17:27:39 KST 2014
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip

‎src/genjava/gradle/gradlew‎

Lines changed: 164 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/genjava/gradle_project.py‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ def author_name():
4242
return name
4343

4444

45-
import subprocess
4645
import tarfile
4746

4847

@@ -51,13 +50,6 @@ def create_gradle_wrapper(repo_path):
5150
archive = tarfile.open(archive_file)
5251
archive.extractall(path=repo_path)
5352
archive.close()
54-
# gradle_binary = os.path.join(os.path.dirname(__file__), 'gradle', 'gradlew')
55-
# cmd = [gradle_binary, '-p', repo_path, 'wrapper']
56-
# print("Creating gradle wrapper: %s" % ' '.join(cmd))
57-
# try:
58-
# subprocess.check_call(cmd)
59-
# except subprocess.CalledProcessError:
60-
# raise subprocess.CalledProcessError("failed to create the gradle wrapper.")
6153

6254

6355
def read_template(tmplf):
@@ -143,7 +135,6 @@ def create(msg_pkg_name, output_dir):
143135
'''
144136
Creates a standalone single project gradle build instance in the specified output directory and
145137
populates it with gradle wrapper and build.gradle file that will enable building of the artifact later.
146-
147138
:param str project_name:
148139
:param dict msg_package_index: { name : catkin_pkg.Package }
149140
:param str output_dir:

0 commit comments

Comments
 (0)