From 241c3a38fd711b3d08f9ecbe088fa35234da6151 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 17 May 2021 21:01:58 -0400 Subject: [PATCH] Bug 572878: Preserve file extension when passing file to be signed Change-Id: I28d15a6430ac3860ba65f6414498793e22dffee0 --- core/org.eclipse.cdt.core.native/native_src/Makefile | 8 ++++---- native/org.eclipse.cdt.native.serial/native_src/Makefile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/org.eclipse.cdt.core.native/native_src/Makefile b/core/org.eclipse.cdt.core.native/native_src/Makefile index c6b99559582..5247d7c46ff 100644 --- a/core/org.eclipse.cdt.core.native/native_src/Makefile +++ b/core/org.eclipse.cdt.core.native/native_src/Makefile @@ -74,10 +74,10 @@ WIN_TO_SIGN=$(OS_DIR_WIN32_X86_64)/starter.exe \ $(OS_DIR_WIN32_X86_64)/spawner.dll \ $(OS_DIR_WIN32_X86_64)/pty.dll production: $(MAC_TO_SIGN) $(WIN_TO_SIGN) - $(foreach tosign,$(MAC_TO_SIGN) $(WIN_TO_SIGN),mv $(tosign) $(tosign)-unsigned &&) true - $(foreach tosign,$(MAC_TO_SIGN),curl -f --silent --show-error -o $(tosign) -F file=@$(tosign)-unsigned https://cbi.eclipse.org/macos/codesign/sign &&) true - $(foreach tosign,$(WIN_TO_SIGN),curl -f --silent --show-error -o $(tosign) -F file=@$(tosign)-unsigned https://cbi.eclipse.org/authenticode/sign &&) true - $(foreach tosign,$(MAC_TO_SIGN) $(WIN_TO_SIGN),rm $(tosign)-unsigned &&) true + $(foreach tosign,$(MAC_TO_SIGN) $(WIN_TO_SIGN),mv $(tosign) unsigned-$(tosign) &&) true + $(foreach tosign,$(MAC_TO_SIGN),curl -f --silent --show-error -o $(tosign) -F file=@unsigned-$(tosign) https://cbi.eclipse.org/macos/codesign/sign &&) true + $(foreach tosign,$(WIN_TO_SIGN),curl -f --silent --show-error -o $(tosign) -F file=@unsigned-$(tosign) https://cbi.eclipse.org/authenticode/sign &&) true + $(foreach tosign,$(MAC_TO_SIGN) $(WIN_TO_SIGN),rm unsigned-$(tosign) &&) true # Windows x86_64 diff --git a/native/org.eclipse.cdt.native.serial/native_src/Makefile b/native/org.eclipse.cdt.native.serial/native_src/Makefile index bdaecb5e19e..b663a61a342 100644 --- a/native/org.eclipse.cdt.native.serial/native_src/Makefile +++ b/native/org.eclipse.cdt.native.serial/native_src/Makefile @@ -50,10 +50,10 @@ clean : MAC_TO_SIGN=$(OS_DIR)/macosx/x86_64/libserial.jnilib WIN_TO_SIGN=$(OS_DIR)/win32/x86_64/serial.dll production: $(MAC_TO_SIGN) $(WIN_TO_SIGN) - $(foreach tosign,$(MAC_TO_SIGN) $(WIN_TO_SIGN),mv $(tosign) $(tosign)-unsigned &&) true - $(foreach tosign,$(MAC_TO_SIGN),curl -f --silent --show-error -o $(tosign) -F file=@$(tosign)-unsigned https://cbi.eclipse.org/macos/codesign/sign &&) true - $(foreach tosign,$(WIN_TO_SIGN),curl -f --silent --show-error -o $(tosign) -F file=@$(tosign)-unsigned https://cbi.eclipse.org/authenticode/sign &&) true - $(foreach tosign,$(MAC_TO_SIGN) $(WIN_TO_SIGN),rm $(tosign)-unsigned &&) true + $(foreach tosign,$(MAC_TO_SIGN) $(WIN_TO_SIGN),mv $(tosign) unsigned-$(tosign) &&) true + $(foreach tosign,$(MAC_TO_SIGN),curl -f --silent --show-error -o $(tosign) -F file=@unsigned-$(tosign) https://cbi.eclipse.org/macos/codesign/sign &&) true + $(foreach tosign,$(WIN_TO_SIGN),curl -f --silent --show-error -o $(tosign) -F file=@unsigned-$(tosign) https://cbi.eclipse.org/authenticode/sign &&) true + $(foreach tosign,$(MAC_TO_SIGN) $(WIN_TO_SIGN),rm unsigned-$(tosign) &&) true rebuild: clean all