[x265] [PATCH 5/5][RFC] Nuke build directory
Steve Borho
steve at borho.org
Mon Sep 23 19:47:03 CEST 2013
On Mon, Sep 23, 2013 at 12:14 PM, Derek Buitenhuis <
derek.buitenhuis at gmail.com> wrote:
> Nuke the useless build scripts which are only variations
> on:
>
> cmake ../../source
> ccmake ../../source (On Linux)
>
> and only call standard, well-known tools like MSBuild, make,
> and nmake (which is deprecated).
>
I could sign-off on this *if* the various MSVC, Xcode, and ICL invocations
were recorded in the README. Some of them take a non-trivial amount of
effort to figure out
>
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> ---
> build/README.txt => README | 15
> +++------------
> build/icl32/build-all.bat | 14
> --------------
> build/icl32/make-makefile.bat | 15
> ---------------
> build/icl64/build-all.bat | 14
> --------------
> build/icl64/make-makefile.bat | 17
> -----------------
> build/linux/make-Makefiles.bash | 3 ---
> build/msys/make-Makefiles.sh | 3 ---
> build/vc10-x86/build-all.bat | 14
> --------------
> build/vc10-x86/make-solutions.bat | 6 ------
> build/vc10-x86_64/build-all.bat | 14
> --------------
> build/vc10-x86_64/make-solutions.bat | 6 ------
> build/vc11-x86/build-all.bat | 14
> --------------
> build/vc11-x86/make-solutions.bat | 6 ------
> build/vc11-x86_64/build-all.bat | 14
> --------------
> build/vc11-x86_64/make-solutions.bat | 6 ------
> build/vc9-x86/build-all.bat | 14
> --------------
> build/vc9-x86/make-solutions.bat | 6 ------
> build/vc9-x86_64/build-all.bat | 14
> --------------
> build/vc9-x86_64/make-solutions.bat | 6 ------
> build/xcode/make-project.sh | 2 --
> .../01build-and-smoke-test.bat | 0
> {build/regression => regression}/02perftest.bat | 0
> .../regression => regression}/commandlines-example.txt | 0
> {build/regression => regression}/config-example.txt | 0
> {build/regression => regression}/email-csv.py | 0
> {build/regression => regression}/run.bat | 0
> 26 files changed, 3 insertions(+), 200 deletions(-)
> rename build/README.txt => README (78%)
> delete mode 100644 build/icl32/build-all.bat
> delete mode 100644 build/icl32/make-makefile.bat
> delete mode 100644 build/icl64/build-all.bat
> delete mode 100644 build/icl64/make-makefile.bat
> delete mode 100755 build/linux/make-Makefiles.bash
> delete mode 100644 build/msys/make-Makefiles.sh
> delete mode 100644 build/vc10-x86/build-all.bat
> delete mode 100644 build/vc10-x86/make-solutions.bat
> delete mode 100644 build/vc10-x86_64/build-all.bat
> delete mode 100644 build/vc10-x86_64/make-solutions.bat
> delete mode 100644 build/vc11-x86/build-all.bat
> delete mode 100644 build/vc11-x86/make-solutions.bat
> delete mode 100644 build/vc11-x86_64/build-all.bat
> delete mode 100644 build/vc11-x86_64/make-solutions.bat
> delete mode 100644 build/vc9-x86/build-all.bat
> delete mode 100644 build/vc9-x86/make-solutions.bat
> delete mode 100644 build/vc9-x86_64/build-all.bat
> delete mode 100644 build/vc9-x86_64/make-solutions.bat
> delete mode 100755 build/xcode/make-project.sh
> rename {build/regression => regression}/01build-and-smoke-test.bat (100%)
> rename {build/regression => regression}/02perftest.bat (100%)
> rename {build/regression => regression}/commandlines-example.txt (100%)
> rename {build/regression => regression}/config-example.txt (100%)
> rename {build/regression => regression}/email-csv.py (100%)
> rename {build/regression => regression}/run.bat (100%)
>
> diff --git a/build/README.txt b/README
> similarity index 78%
> rename from build/README.txt
> rename to README
> index db50354..2c9b13a 100644
> --- a/build/README.txt
> +++ b/README
> @@ -42,23 +42,14 @@
>
> = Build Instructions Linux =
>
> -1. Use cmake to generate Makefiles: cmake ../source
> +1. Use cmake to generate Makefiles: cmake ../x265/source
> 2. Build x265: make
>
> - Or use our shell script which runs cmake then opens the curses GUI to
> - configure build options
> -
> -1. cd build/linux ; ./make-Makefiles.bash
> -2. make
> -
>
> = Build Instructions Windows =
>
> -We recommend you use one of the make-solutions.bat files in the
> appropriate
> -build/ sub-folder for your preferred compiler. They will open the
> cmake-gui
> -to configure build options, click configure until no more red options
> remain,
> -then click generate and exit. There should now be an x265.sln file in the
> -same folder, open this in Visual Studio and build it.
> +Open cmake-gui and point it at the source directory, and select which
> +compiler and output type is required. Build as you would normally.
>
> = Version number considerations =
>
> diff --git a/build/icl32/build-all.bat b/build/icl32/build-all.bat
> deleted file mode 100644
> index cbe9a59..0000000
> diff --git a/build/icl32/make-makefile.bat b/build/icl32/make-makefile.bat
> deleted file mode 100644
> index 799344e..0000000
> diff --git a/build/icl64/build-all.bat b/build/icl64/build-all.bat
> deleted file mode 100644
> index d1d6b8d..0000000
> diff --git a/build/icl64/make-makefile.bat b/build/icl64/make-makefile.bat
> deleted file mode 100644
> index 2d3f629..0000000
> diff --git a/build/linux/make-Makefiles.bash
> b/build/linux/make-Makefiles.bash
> deleted file mode 100755
> index 4315d61..0000000
> diff --git a/build/msys/make-Makefiles.sh b/build/msys/make-Makefiles.sh
> deleted file mode 100644
> index 5387b5a..0000000
> diff --git a/build/vc10-x86/build-all.bat b/build/vc10-x86/build-all.bat
> deleted file mode 100644
> index 5a906e5..0000000
> diff --git a/build/vc10-x86/make-solutions.bat
> b/build/vc10-x86/make-solutions.bat
> deleted file mode 100644
> index 23c2c61..0000000
> diff --git a/build/vc10-x86_64/build-all.bat
> b/build/vc10-x86_64/build-all.bat
> deleted file mode 100644
> index 5a906e5..0000000
> diff --git a/build/vc10-x86_64/make-solutions.bat
> b/build/vc10-x86_64/make-solutions.bat
> deleted file mode 100644
> index 71afcc0..0000000
> diff --git a/build/vc11-x86/build-all.bat b/build/vc11-x86/build-all.bat
> deleted file mode 100644
> index 4445c03..0000000
> diff --git a/build/vc11-x86/make-solutions.bat
> b/build/vc11-x86/make-solutions.bat
> deleted file mode 100644
> index 0b9d049..0000000
> diff --git a/build/vc11-x86_64/build-all.bat
> b/build/vc11-x86_64/build-all.bat
> deleted file mode 100644
> index 4445c03..0000000
> diff --git a/build/vc11-x86_64/make-solutions.bat
> b/build/vc11-x86_64/make-solutions.bat
> deleted file mode 100644
> index d243bcd..0000000
> diff --git a/build/vc9-x86/build-all.bat b/build/vc9-x86/build-all.bat
> deleted file mode 100644
> index 8af8a4e..0000000
> diff --git a/build/vc9-x86/make-solutions.bat
> b/build/vc9-x86/make-solutions.bat
> deleted file mode 100644
> index 7a24aa3..0000000
> diff --git a/build/vc9-x86_64/build-all.bat
> b/build/vc9-x86_64/build-all.bat
> deleted file mode 100644
> index 8af8a4e..0000000
> diff --git a/build/vc9-x86_64/make-solutions.bat
> b/build/vc9-x86_64/make-solutions.bat
> deleted file mode 100644
> index 82a927e..0000000
> diff --git a/build/xcode/make-project.sh b/build/xcode/make-project.sh
> deleted file mode 100755
> index f4a4f7f..0000000
> diff --git a/build/regression/01build-and-smoke-test.bat
> b/regression/01build-and-smoke-test.bat
> similarity index 100%
> rename from build/regression/01build-and-smoke-test.bat
> rename to regression/01build-and-smoke-test.bat
> diff --git a/build/regression/02perftest.bat b/regression/02perftest.bat
> similarity index 100%
> rename from build/regression/02perftest.bat
> rename to regression/02perftest.bat
> diff --git a/build/regression/commandlines-example.txt
> b/regression/commandlines-example.txt
> similarity index 100%
> rename from build/regression/commandlines-example.txt
> rename to regression/commandlines-example.txt
> diff --git a/build/regression/config-example.txt
> b/regression/config-example.txt
> similarity index 100%
> rename from build/regression/config-example.txt
> rename to regression/config-example.txt
> diff --git a/build/regression/email-csv.py b/regression/email-csv.py
> similarity index 100%
> rename from build/regression/email-csv.py
> rename to regression/email-csv.py
> diff --git a/build/regression/run.bat b/regression/run.bat
> similarity index 100%
> rename from build/regression/run.bat
> rename to regression/run.bat
> --
> 1.8.4
>
> _______________________________________________
> x265-devel mailing list
> x265-devel at videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
--
Steve Borho
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20130923/78761425/attachment-0001.html>
More information about the x265-devel
mailing list