Skip to content

Commit b63b926

Browse files
(#14316) [openapi-generator/6.2.1] Add version and improve jar reference
* [openapi-generator/6.2.1] Add version * Use relative path to jar file * Use CLASSPATH environment variable * Fix windows argument transmission
1 parent 8649e2b commit b63b926

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

recipes/openapi-generator/all/conandata.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
sources:
2+
"6.2.1":
3+
url: "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.1/openapi-generator-cli-6.2.1.jar"
4+
sha256: "f2c8600f2c23ee1123eebf47ef0f40db386627e75b0340ca16182c10f4174fa9"
25
"6.2.0":
36
url: "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.0/openapi-generator-cli-6.2.0.jar"
47
sha256: "60707e2c8938a94278f6216081d7067d0f1beced8c8eb1277e625e9a59ccd2da"

recipes/openapi-generator/all/conanfile.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,20 @@ def build(self):
4848
def package(self):
4949
copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
5050
copy(self, pattern="openapi-generator.jar", dst=os.path.join(self.package_folder, "res"), src=self.source_folder)
51-
jar = os.path.join(self.package_folder, "res", "openapi-generator.jar")
5251
if self.info.settings.os == "Windows":
5352
save(self,
5453
path=os.path.join(self.package_folder, "bin", "openapi-generator.bat"),
55-
content=f"""\
56-
java -jar {jar} %*
54+
content="""\
55+
java -classpath %CLASSPATH% org.openapitools.codegen.OpenAPIGenerator %*
5756
"""
5857
)
5958
else:
6059
bin_path = os.path.join(self.package_folder, "bin", "openapi-generator")
6160
save(self,
6261
path=bin_path,
63-
content=f"""\
62+
content="""\
6463
#!/bin/bash
65-
java -jar {jar} $@
64+
java -classpath $CLASSPATH org.openapitools.codegen.OpenAPIGenerator $@
6665
"""
6766
)
6867
st = os.stat(bin_path)
@@ -74,3 +73,8 @@ def package_info(self):
7473
self.cpp_info.libdirs = []
7574
self.cpp_info.resdirs = []
7675
self.cpp_info.includedirs = []
76+
jar = os.path.join(self.package_folder, "res", "openapi-generator.jar")
77+
self.runenv_info.prepend_path("CLASSPATH", jar)
78+
79+
# TODO: Legacy, to be removed on Conan 2.0
80+
self.env_info.CLASSPATH.append(jar)

recipes/openapi-generator/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versions:
2+
"6.2.1":
3+
folder: all
24
"6.2.0":
35
folder: all
46
"6.1.0":

0 commit comments

Comments
 (0)