dyncall is now on Mercurial: update checkout scripts

nativelibs4java · Mar 21, 2015 · 895b264 · 895b264
1 parent 53af704
commit 895b264
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/BuildNative b/BuildNative
@@ -17,7 +17,7 @@ then
 fi
 
 cd $DYNCALL_HOME
-svn diff > $DYNCALL_DIFF
+hg diff > $DYNCALL_DIFF
 cd $BASE_DIR
 
 MAKE_CMD=make
@@ -125,7 +125,7 @@ function build_libraries() {
     for BRIDJ_TARGET in $BRIDJ_TARGETS ; do
 	    case $BRIDJ_TARGET in
 	    default)
-		    cd $DYNCALL_HOME/dyncall
+		    cd $DYNCALL_HOME
 		    local DYNCALL_CONFIGURE_ARGS=""
 		    if [[ "$ARCH" != "$NATIVE_ARCH" ]]; then
 		        DYNCALL_CONFIGURE_ARGS="--target-$ARCH"

diff --git a/admin/checkout_and_patch_dyncall.sh b/admin/checkout_and_patch_dyncall.sh
@@ -30,7 +30,7 @@ PATCH_FILE=$1
 #fi
 
 #echo "Checking out dyncall to $DYNCALL_HOME..."
-svn co http://www.dyncall.org/svn/dyncall/trunk $DYNCALL_HOME || failed "Failed to checkout dyncall to $DYNCALL_HOME" 
+hg clone http://hg.dyncall.org/pub/dyncall/dyncall $DYNCALL_HOME || failed "Failed to checkout dyncall to $DYNCALL_HOME" 
 cd $DYNCALL_HOME || failed "Failed to go to $DYNCALL_HOME"
 
 echo "Applying BridJ's dyncall patches..."
@@ -41,12 +41,12 @@ else
 	PATCH_CMD=gpatch
 fi
 
-$PATCH_CMD -i $PATCH_FILE -N -p0
+$PATCH_CMD -i $PATCH_FILE -N -p1
 # $PATCH_CMD -i $PATCH_FILE -N -p0 || ( rm -fR $DYNCALL_HOME && failed "Patch failed, deleted $DYNCALL_HOME" )
 
 echo "Ensuring all diffed files are added to SVN..."
-svn add `find . -type f | grep -v .svn` 2> /dev/null 
+hg add `find . -type f | grep -v .hg` 2> /dev/null 
 
-echo "Displaying svn status..."
-svn status
+echo "Displaying hg status..."
+hg status
 
diff --git a/src/main/cpp/bridj/MakeAndroid.sh b/src/main/cpp/bridj/MakeAndroid.sh
@@ -17,7 +17,7 @@ NDK_PROJECT_PATH="$PWD"
 [[ -n "$ANDROID_NDK_HOME" ]] || fail "ANDROID_NDK_HOME not defined."
 
 if [[ ! -e jni/dyncall ]]; then
-    ln -s "$DYNCALL_HOME/dyncall/" jni/dyncall
+    ln -s "$DYNCALL_HOME/" jni/dyncall
 fi
 
 #ABIS="x86 armeabi mips"

diff --git a/src/main/cpp/bridj/Makefile b/src/main/cpp/bridj/Makefile
@@ -22,10 +22,10 @@ UNITS += RawNativeForwardCallback_arch
 UNITS += ThreadLocal
 UNITS += Utils
 
+CPPFLAGS  += -I$(DYNCALL_HOME)
 CPPFLAGS  += -I$(DYNCALL_HOME)/dyncall
-CPPFLAGS  += -I$(DYNCALL_HOME)/dyncall/dyncall
-CPPFLAGS  += -I$(DYNCALL_HOME)/dyncall/dyncallback
-CPPFLAGS  += -I$(DYNCALL_HOME)/dyncall/dynload
+CPPFLAGS  += -I$(DYNCALL_HOME)/dyncallback
+CPPFLAGS  += -I$(DYNCALL_HOME)/dynload
 
 ifneq ($(ARCH), armhf)
 CPPFLAGS  += -mtune=generic
@@ -84,12 +84,12 @@ CPPFLAGS  +=  -I$(JAVA_HOME)/include/solaris
 CPPFLAGS  +=  -I$(JAVA_HOME)/include/windows
 CPPFLAGS  +=  -I$(JAVA_HOME)/include/darwin
 
-LDFLAGS   += -L$(DYNCALL_HOME)/dyncall/dyncall/$(DYNCALL_BUILD_DIR)
-LDFLAGS   += -L$(DYNCALL_HOME)/dyncall/dynload/$(DYNCALL_BUILD_DIR)
-LDFLAGS   += -L$(DYNCALL_HOME)/dyncall/dyncallback/$(DYNCALL_BUILD_DIR)
-LDFLAGS   += -L$(DYNCALL_HOME)/dyncall/dyncall
-LDFLAGS   += -L$(DYNCALL_HOME)/dyncall/dynload
-LDFLAGS   += -L$(DYNCALL_HOME)/dyncall/dyncallback
+LDFLAGS   += -L$(DYNCALL_HOME)/dyncall/$(DYNCALL_BUILD_DIR)
+LDFLAGS   += -L$(DYNCALL_HOME)/dynload/$(DYNCALL_BUILD_DIR)
+LDFLAGS   += -L$(DYNCALL_HOME)/dyncallback/$(DYNCALL_BUILD_DIR)
+LDFLAGS   += -L$(DYNCALL_HOME)/dyncall
+LDFLAGS   += -L$(DYNCALL_HOME)/dynload
+LDFLAGS   += -L$(DYNCALL_HOME)/dyncallback
 LDFLAGS   += -l dyncall_s -l dynload_s -l dyncallback_s
 
 include epilog.make