11#! /usr/bin/env python3
22import argparse , common , glob , os , re , subprocess , sys
3- from typing import List
3+ from typing import List , Tuple
44from contextlib import contextmanager
55
66def parse_version (args : object ) -> str :
@@ -75,19 +75,19 @@ def package_jar(
7575 "--create" ,
7676 "--file" , outjar ,
7777 "-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 )
8181 return outjar
8282
83- def package (rev :str , jarCmdArgs : List [str ]= [])-> tuple [str ,str ,str ]:
83+ def package (rev : str , jarCmdArgs : List [str ] = []) -> Tuple [str ,str ,str ]:
8484 """
8585 Args:
8686 rev (str): Version number for jar, sourcejar, javadoc and pom.
8787 jarCmdArgs (List[str]): additional arguments passed to `jar --create` command.
8888
8989 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.
9191 """
9292 # Update poms
9393 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]:
108108 f .write (rev )
109109
110110 # 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 )
112112
113113 # jwm-*-sources.jar
114114 print (f"Packaging jwm-{ rev } -sources.jar" )
0 commit comments