improve build scripts

Author: Andrea Medeghini

Makefile

@@ -20,6 +20,12 @@ extract:
 	@echo System = $(system)
 	cd ffmpeg4java-$(system) && ./extract.sh
 
+.PHONY: dump
+dump:
+	test $(system)
+	@echo System = $(system)
+	cd ffmpeg4java-$(system) && ./dump.sh
+
 .PHONY: verify
 verify:
 	test $(system)

ffmpeg4java-linux/dump.sh

@@ -4,4 +4,6 @@ FFMPEG_HOME=$(pwd)/native/ffmpeg
 
 export PATH=$PATH:${JEXTRACT_HOME}/bin
 
-jextract --dump-includes includes.txt --include-dir "${FFMPEG_HOME}" libffmpeg.h
+jextract --dump-includes includes.txt \
+  --include-dir "${FFMPEG_HOME}" \
+  libffmpeg.h

ffmpeg4java-linux/native/scripts/checkout.sh

@@ -2,14 +2,16 @@
 
 set -e
 
-if [ ! -d "$(pwd)/ffmpeg" ]; then
-  git clone https://git.ffmpeg.org/ffmpeg.git "$(pwd)/ffmpeg"
+FFMPEG_HOME=$(pwd)/ffmpeg
+
+if [ ! -d "$FFMPEG_HOME" ]; then
+  git clone https://git.ffmpeg.org/ffmpeg.git "$FFMPEG_HOME"
 else
-  pushd "$(pwd)/ffmpeg"
+  pushd "$FFMPEG_HOME"
   git fetch
   popd
 fi
 
-pushd "$(pwd)/ffmpeg"
+pushd "$FFMPEG_HOME"
 git checkout af25a4bfd2503caf3ee485b27b99b620302f5718
 popd

ffmpeg4java-macos/dump.sh

@@ -4,4 +4,6 @@ FFMPEG_HOME=$(pwd)/native/ffmpeg
 
 export PATH=$PATH:${JEXTRACT_HOME}/bin
 
-jextract --dump-includes includes.txt --include-dir "${FFMPEG_HOME}" libffmpeg.h
+jextract --dump-includes includes.txt \
+  --include-dir "${FFMPEG_HOME}" \
+  libffmpeg.h

ffmpeg4java-macos/native/scripts/checkout.sh

@@ -2,14 +2,16 @@
 
 set -e
 
-if [ ! -d "$(pwd)/ffmpeg" ]; then
-  git clone https://git.ffmpeg.org/ffmpeg.git "$(pwd)/ffmpeg"
+FFMPEG_HOME=$(pwd)/ffmpeg
+
+if [ ! -d "$FFMPEG_HOME" ]; then
+  git clone https://git.ffmpeg.org/ffmpeg.git "$FFMPEG_HOME"
 else
-  pushd "$(pwd)/ffmpeg"
+  pushd "$FFMPEG_HOME"
   git fetch
   popd
 fi
 
-pushd "$(pwd)/ffmpeg"
+pushd "$FFMPEG_HOME"
 git checkout af25a4bfd2503caf3ee485b27b99b620302f5718
 popd

ffmpeg4java-windows/dump.sh

@@ -1,8 +1,11 @@
 #!/bin/sh
 
-FFMPEG_HOME="Z:/Documents/projects/github/ffmpeg4java/ffmpeg4java-windows/native/ffmpeg"
-INCLUDE_PATH="C:/Users/andrea/Documents/cygwin/usr/include"
+FFMPEG_HOME="$(cygpath -w $(pwd)/native/ffmpeg)"
+INCLUDE_PATH="$(cygpath -w $CYGWIN_HOME/usr/include)"
 
 export PATH=$PATH:${JEXTRACT_HOME}/bin
 
-jextract --dump-includes includes.txt --include-dir "${FFMPEG_HOME}" --include-dir "${INCLUDE_PATH}" libffmpeg.h
+jextract --dump-includes includes.txt \
+  --include-dir "${FFMPEG_HOME}" \
+  --include-dir "${INCLUDE_PATH}" \
+  libffmpeg.h

ffmpeg4java-windows/extract.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-FFMPEG_HOME="Z:/Documents/projects/github/ffmpeg4java/ffmpeg4java-windows/native/ffmpeg"
-INCLUDE_PATH="C:/Users/andrea/Documents/cygwin/usr/include"
+FFMPEG_HOME="$(cygpath -w $(pwd)/native/ffmpeg)"
+INCLUDE_PATH="$(cygpath -w $CYGWIN_HOME/usr/include)"
 
 export PATH=$PATH:${JEXTRACT_HOME}/bin
 

ffmpeg4java-windows/native/scripts/checkout.sh

@@ -2,14 +2,16 @@
 
 set -e
 
-if [ ! -d "$(pwd)/ffmpeg" ]; then
-  git clone https://git.ffmpeg.org/ffmpeg.git "$(pwd)/ffmpeg"
+FFMPEG_HOME=$(pwd)/ffmpeg
+
+if [ ! -d "$FFMPEG_HOME" ]; then
+  git clone https://git.ffmpeg.org/ffmpeg.git "$FFMPEG_HOME"
 else
-  pushd "$(pwd)/ffmpeg"
+  pushd "$FFMPEG_HOME"
   git fetch
   popd
 fi
 
-pushd "$(pwd)/ffmpeg"
+pushd "$FFMPEG_HOME"
 git checkout af25a4bfd2503caf3ee485b27b99b620302f5718
 popd

ffmpeg4java-windows/source

@@ -1,5 +1,4 @@
+export CYGWIN_HOME="/cygdrive/c/Users/andrea/Documents/cygwin"
 export JAVA_HOME=/cygdrive/c/Users/andrea/Documents/jdk-22.0.1+8
 export JEXTRACT_HOME=/cygdrive/c/Users/andrea/Documents/jextract-22
-export ANT_HOME=/cygdrive/c/Users/andrea/Documents/apache-ant-1.10.14
-export MAVEN_HOME=/cygdrive/c/Users/andrea/Documents/apache-maven-3.9.8
-export PATH=$PATH:$JAVA_HOME/bin:$JEXTRACT_HOME/bin:$ANT_HOME/bin:$MAVEN_HOME/bin
+export PATH=$PATH:$JAVA_HOME/bin:$JEXTRACT_HOME/bin