1
1
#! /usr/bin/env python3
2
2
import argparse , common , glob , os , re , subprocess , sys
3
- from typing import List
3
+ from typing import List , Tuple
4
4
from contextlib import contextmanager
5
5
6
6
def parse_version (args : object ) -> str :
@@ -75,19 +75,19 @@ def package_jar(
75
75
"--create" ,
76
76
"--file" , outjar ,
77
77
"-C" , classes , "." ,
78
- "-C" , targetmaven , "META-INF" ,
79
- "-C" , common .target_native_dir , common .target_native_lib
80
- ] + jarCmdArgs )
78
+ "-C" , targetmaven , "META-INF" ]
79
+ + ([ "-C" , common .target_native_dir , common .target_native_lib ] if os . path . exists ( common . target_native_dir + "/" + common . target_native_lib ) else [])
80
+ + jarCmdArgs )
81
81
return outjar
82
82
83
- def package (rev :str , jarCmdArgs : List [str ]= [])-> tuple [str ,str ,str ]:
83
+ def package (rev : str , jarCmdArgs : List [str ] = []) -> Tuple [str ,str ,str ]:
84
84
"""
85
85
Args:
86
86
rev (str): Version number for jar, sourcejar, javadoc and pom.
87
87
jarCmdArgs (List[str]): additional arguments passed to `jar --create` command.
88
88
89
89
Returns:
90
- outjarpath,sourcejar_path,javadoc_path (tuple [str,str,str]): Absolute paths to generated files.
90
+ outjarpath, sourcejar_path, javadoc_path(Tuple [str, str, str]): Absolute paths to generated files.
91
91
"""
92
92
# Update poms
93
93
jwmtarget = os .path .join (common .basedir ,"target/maven/META-INF/maven/io.github.humbleui.jwm/jwm" )
@@ -108,7 +108,7 @@ def package(rev:str, jarCmdArgs :List[str]=[])->tuple[str,str,str]:
108
108
f .write (rev )
109
109
110
110
# jwm-*.jar
111
- outjar = package_jar (os .path .join (common .basedir ,f"target/jwm-{ rev } .jar" ),targetclasses ,jarCmdArgs = jarCmdArgs )
111
+ outjar = package_jar (os .path .join (common .basedir ,f"target/jwm-{ rev } .jar" ), targetclasses , jarCmdArgs = jarCmdArgs )
112
112
113
113
# jwm-*-sources.jar
114
114
print (f"Packaging jwm-{ rev } -sources.jar" )
0 commit comments