From e97bdb53f484cb40734f89960fe4111083f63e10 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Mon, 30 Oct 2017 03:45:50 +0800 Subject: [PATCH] Adjust java paths --- build.py | 9 +++++---- java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.py b/build.py index 683cbcce1..c9c3ec10a 100755 --- a/build.py +++ b/build.py @@ -151,7 +151,8 @@ def build_snet(args): os.chdir('..') def sign_adjust_zip(unsigned, output): - jarsigner = os.path.join('java', 'jarsigner', 'build', 'libs', 'jarsigner-fat.jar') + signer_name = 'zipsigner-1.0.jar' + jarsigner = os.path.join('java', 'crypto', 'build', 'libs', signer_name) if os.name != 'nt' and not os.path.exists(os.path.join('ziptools', 'zipadjust')): header('* Building zipadjust') @@ -160,11 +161,11 @@ def sign_adjust_zip(unsigned, output): if proc.returncode != 0: error('Build zipadjust failed!') if not os.path.exists(jarsigner): - header('* Building jarsigner-fat.jar') + header('* Building ' + signer_name) os.chdir('java') - proc = subprocess.run('{} jarsigner:shadowJar'.format(os.path.join('.', 'gradlew')), shell=True) + proc = subprocess.run('{} crypto:shadowJar'.format(os.path.join('.', 'gradlew')), shell=True) if proc.returncode != 0: - error('Build jarsigner-fat.jar failed!') + error('Build {} failed!'.format(signer_name)) os.chdir('..') header('* Signing / Adjusting Zip') diff --git a/java b/java index 4956d826f..05f41928c 160000 --- a/java +++ b/java @@ -1 +1 @@ -Subproject commit 4956d826fbdbad35645260aa3edb3b746651cceb +Subproject commit 05f41928cd0f72ddab557c8db6c2fc11c3fd08e6