You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/07/02 18:22:24 UTC
commons-crypto git commit: CRYPTO-101 Makefile does not use correct
PATH separator for Windows
Repository: commons-crypto
Updated Branches:
refs/heads/master b8a49c41d -> d06cb33d6
CRYPTO-101 Makefile does not use correct PATH separator for Windows
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/d06cb33d
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/d06cb33d
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/d06cb33d
Branch: refs/heads/master
Commit: d06cb33d6e89975a905ff1c3a1b2b7674782d6ef
Parents: b8a49c4
Author: Sebb <se...@apache.org>
Authored: Sat Jul 2 19:22:18 2016 +0100
Committer: Sebb <se...@apache.org>
Committed: Sat Jul 2 19:22:18 2016 +0100
----------------------------------------------------------------------
Makefile | 12 ++++++++++--
Makefile.common | 7 -------
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/d06cb33d/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 6b98056..9147eb8 100644
--- a/Makefile
+++ b/Makefile
@@ -28,16 +28,24 @@ else
TAR:= tar
endif
+# Windows uses different path separators
+ifeq ($(OS_NAME),Windows)
+ SEP := ;
+else
+ SEP := :
+endif
+
+
NATIVE_TARGET_DIR:=$(TARGET)/classes/org/apache/commons/crypto/native/$(OS_NAME)/$(OS_ARCH)
NATIVE_DLL:=$(NATIVE_TARGET_DIR)/$(LIBNAME)
all: $(NATIVE_DLL)
$(TARGET)/jni-classes/org/apache/commons/crypto/cipher/OpenSslNative.h: $(TARGET)/classes/org/apache/commons/crypto/cipher/OpenSslNative.class
- $(JAVAH) -force -classpath $(TARGET)/jni-classes:$(TARGET)/classes -o $@ org.apache.commons.crypto.cipher.OpenSslNative
+ $(JAVAH) -force -classpath $(TARGET)/jni-classes$(SEP)$(TARGET)/classes -o $@ org.apache.commons.crypto.cipher.OpenSslNative
$(TARGET)/jni-classes/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.h: $(TARGET)/classes/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.class
- $(JAVAH) -force -classpath $(TARGET)/jni-classes:$(TARGET)/classes -o $@ org.apache.commons.crypto.random.OpenSslCryptoRandomNative
+ $(JAVAH) -force -classpath $(TARGET)/jni-classes$(SEP)$(TARGET)/classes -o $@ org.apache.commons.crypto.random.OpenSslCryptoRandomNative
$(COMMONS_CRYPTO_OUT)/OpenSslNative.o : $(SRC_NATIVE)/org/apache/commons/crypto/cipher/OpenSslNative.c $(TARGET)/jni-classes/org/apache/commons/crypto/cipher/OpenSslNative.h
@mkdir -p $(@D)
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/d06cb33d/Makefile.common
----------------------------------------------------------------------
diff --git a/Makefile.common b/Makefile.common
index 57fd7e0..67148c3 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -43,13 +43,6 @@ OS_ARCH := $(shell $(JAVA) -cp $(TARGET)/classes $(OSINFO_CLASS) --arch)
LIB_FOLDER := $(shell $(JAVA) -cp $(TARGET)/classes $(OSINFO_CLASS))
IBM_JDK_LIB := lib/inc_ibm
-# Windows uses different path separators
-ifeq ($(OS_NAME),Windows)
- sep := ;
-else
- sep := :
-endif
-
commons-crypto := commons-crypto-$(VERSION)