improve build scripts

Author: Andrea Medeghini

ffmpeg4java-linux/native/Makefile

@@ -1,4 +1,4 @@
-INSTALL_PATH := $(PWD)/../src/main/resources
+INSTALL_PATH := $(CURDIR)/../src/main/resources
 
 .PHONY: checkout
 checkout:
@@ -21,12 +21,12 @@ install:
 	./scripts/copy.sh $(INSTALL_PATH)
 
 .PHONY: all
-all: checkout configure compile install
+all: build-lib install
 
 .PHONY: build-image
 build-image:
 	docker build -t ffmpeg4java-linux .
 
 .PHONY: build-lib
-build-lib:
-	docker run --rm -i -v $(PWD):/var/native ffmpeg4java-linux make checkout configure compile
+build-lib: build-image
+	docker run --rm -i -v $(CURDIR):/var/native ffmpeg4java-linux make checkout configure compile

ffmpeg4java-linux/native/scripts/checkout.sh

@@ -1,7 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
-test ! -d "$(pwd)/ffmpeg" && git clone https://git.ffmpeg.org/ffmpeg.git "$(pwd)/ffmpeg"
+if [ ! -d "$(pwd)/ffmpeg" ]; then
+  git clone https://git.ffmpeg.org/ffmpeg.git "$(pwd)/ffmpeg"
+else
+  pushd "$(pwd)/ffmpeg"
+  git fetch
+  popd
+fi
 
-cd "$(pwd)/ffmpeg" && git checkout af25a4bfd2503caf3ee485b27b99b620302f5718
+pushd "$(pwd)/ffmpeg"
+git checkout af25a4bfd2503caf3ee485b27b99b620302f5718
+popd

ffmpeg4java-macos/native/Makefile

@@ -1,4 +1,4 @@
-INSTALL_PATH := $(PWD)/../src/main/resources
+INSTALL_PATH := $(CURDIR)/../src/main/resources
 
 .PHONY: checkout
 checkout:
@@ -21,4 +21,7 @@ install:
 	./scripts/copy.sh $(INSTALL_PATH)
 
 .PHONY: all
-all: checkout configure compile install
+all: build-lib install
+
+.PHONY: build-lib
+build-lib: checkout configure compile

ffmpeg4java-macos/native/scripts/checkout.sh

@@ -1,7 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
-test ! -d "$(pwd)/ffmpeg" && git clone https://git.ffmpeg.org/ffmpeg.git "$(pwd)/ffmpeg"
+if [ ! -d "$(pwd)/ffmpeg" ]; then
+  git clone https://git.ffmpeg.org/ffmpeg.git "$(pwd)/ffmpeg"
+else
+  pushd "$(pwd)/ffmpeg"
+  git fetch
+  popd
+fi
 
-cd "$(pwd)/ffmpeg" && git checkout af25a4bfd2503caf3ee485b27b99b620302f5718
+pushd "$(pwd)/ffmpeg"
+git checkout af25a4bfd2503caf3ee485b27b99b620302f5718
+popd

ffmpeg4java-windows/native/Makefile

@@ -1,4 +1,4 @@
-INSTALL_PATH := $(PWD)/../src/main/resources
+INSTALL_PATH := $(CURDIR)/../src/main/resources
 
 .PHONY: checkout
 checkout:
@@ -21,12 +21,12 @@ install:
 	./scripts/copy.sh $(INSTALL_PATH)
 
 .PHONY: all
-all: checkout configure compile install
+all: build-lib install
 
 .PHONY: build-image
 build-image:
 	docker build -t ffmpeg4java-linux .
 
 .PHONY: build-lib
-build-lib:
-	docker run --rm -i -v $(PWD):/var/native ffmpeg4java-linux make compile
+build-lib: build-image
+	docker run --rm -i -v $(CURDIR):/var/native ffmpeg4java-linux make checkout configure compile

ffmpeg4java-windows/native/scripts/checkout.sh

@@ -1,7 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
-test ! -d "$(pwd)/ffmpeg" && git clone https://git.ffmpeg.org/ffmpeg.git "$(pwd)/ffmpeg"
+if [ ! -d "$(pwd)/ffmpeg" ]; then
+  git clone https://git.ffmpeg.org/ffmpeg.git "$(pwd)/ffmpeg"
+else
+  pushd "$(pwd)/ffmpeg"
+  git fetch
+  popd
+fi
 
-cd "$(pwd)/ffmpeg" && git checkout af25a4bfd2503caf3ee485b27b99b620302f5718
+pushd "$(pwd)/ffmpeg"
+git checkout af25a4bfd2503caf3ee485b27b99b620302f5718
+popd