Refactoring

Andrea Medeghini · Andrea Medeghini · commit 6608666036d5 · 2016-08-08T20:50:17.000+01:00
diff --git a/COPYING LGPL v2.1.txt b/COPYING LGPL v2.1.txt
diff --git a/Dockerfile.java b/Dockerfile.java
@@ -1,4 +1,4 @@
-FROM ffmpeg4java:latest
+FROM ffmpeg4java-base:latest
 
 COPY ffmpeg4java.i ffmpeg4java.i 
 
diff --git a/Dockerfile.linux b/Dockerfile.linux
@@ -5,7 +5,7 @@ RUN apt-get update && apt-get -y install make gcc g++
 COPY Makefile.lib.linux ffmpeg/Makefile.lib.linux
 COPY Makefile.jni.linux ffmpeg/Makefile.jni.linux
 
-COPY Patch.linux ffmpeg/Patch.linux
+COPY Patch.linux Patch.linux
 
 COPY build-linux.sh build-linux.sh
 
diff --git a/Dockerfile.mingw64 b/Dockerfile.mingw64
@@ -5,7 +5,7 @@ RUN apt-get update && apt-get -y install make mingw-w64
 COPY Makefile.lib.mingw64 ffmpeg/Makefile.lib.mingw64
 COPY Makefile.jni.mingw64 ffmpeg/Makefile.jni.mingw64
 
-COPY Patch.mingw64 ffmpeg/Patch.mingw64
+COPY Patch.mingw64 Patch.mingw64
 
 COPY build-mingw64.sh build-mingw64.sh
 
diff --git a/Dockerfile.repo b/Dockerfile.repo
@@ -1,3 +1,5 @@
-FROM ffmpeg4java:latest
+FROM ffmpeg4java-base:latest
 
-RUN git clone https://github.com/nextbreakpoint/FFmpeg.git ffmpeg
+COPY checkout.sh checkout.sh
+
+RUN sh checkout.sh
diff --git a/README.md b/README.md
@@ -93,6 +93,10 @@ We use docker for compiling Linux library.
 
     Generate JNI code before compiling library for Linux
 
+Create repository image:
+
+    sh create-image-repo.sh
+
 Create image for building library:
 
     sh create-image-linux.sh
@@ -112,6 +116,10 @@ We use docker for cross-compiling Windows library using Mingw-w64.
 
     Generate JNI code before compiling library for Windows
 
+Create repository image:
+
+    sh create-image-repo.sh
+
 Create image for building library:
 
     sh create-image-mingw64.sh
diff --git a/build-linux.sh b/build-linux.sh
@@ -1,17 +1,9 @@
 #/bin/sh
 export BUILD_DIR=`pwd`/build
 
-cd ffmpeg
-
-git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5
-
-cd ..
-
-Patch.linux ffmpeg/Patch.linux
-patch -p0 < ffmpeg/Patch.linux
+patch -p0 < Patch.linux
 
 cd ffmpeg
 
 make -f Makefile.lib.linux ffmpeg
-
 make -f Makefile.jni.linux all
diff --git a/build-macos.sh b/build-macos.sh
@@ -3,23 +3,14 @@ export BUILD_DIR=`pwd`/build
 
 rm -fR ffmpeg
 
-git clone https://github.com/nextbreakpoint/FFmpeg.git ffmpeg
+sh checkout.sh
 
 cp Makefile.lib.macos ffmpeg/Makefile.lib.macos
 cp Makefile.jni.macos ffmpeg/Makefile.jni.macos
 
-cp Patch.macos ffmpeg/Patch.macos
-
-cd ffmpeg
-
-git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5
-
-cd ..
-
-patch -p0 < ffmpeg/Patch.macos
+patch -p0 < Patch.macos
 
 cd ffmpeg
 
 make -f Makefile.lib.macos ffmpeg
-
 make -f Makefile.jni.macos all
diff --git a/build-mingw64.sh b/build-mingw64.sh
@@ -1,16 +1,9 @@
 #/bin/sh
 export BUILD_DIR=`pwd`/build
 
-cd ffmpeg
-
-git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5
-
-cd ..
-
-patch -p0 < ffmpeg/Patch.mingw64
+patch -p0 < Patch.mingw64
 
 cd ffmpeg
 
 make -f Makefile.lib.mingw64 ffmpeg
-
 make -f Makefile.jni.mingw64 all
diff --git a/checkout.sh b/checkout.sh
@@ -0,0 +1,5 @@
+#/bin/sh
+
+git clone https://github.com/nextbreakpoint/FFmpeg.git ffmpeg
+
+cd ffmpeg && git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5
diff --git a/create-image-base.sh b/create-image-base.sh
@@ -1,3 +1,3 @@
 #/bin/sh
 
-docker build -t ffmpeg4java -f Dockerfile.base .
+docker build -t ffmpeg4java-base -f Dockerfile.base .

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ffmpeg4java:latest`
	`1`	`+FROM ffmpeg4java-base:latest`
`2`	`2`
`3`	`3`	`COPY ffmpeg4java.i ffmpeg4java.i`
`4`	`4`