From e579ab5faa4de2812f97174c2e17d3889a3c58ea Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 12:57:05 +0100 Subject: [PATCH 01/12] introduced QEMU_SYS --- Makefile | 10 +++++++--- tests/Makefile | 22 +++++++++++----------- tests/playTests.sh | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 856b1a07..7d36ab2a 100644 --- a/Makefile +++ b/Makefile @@ -93,15 +93,19 @@ clangtest: clean armtest: clean $(MAKE) -C $(TESTDIR) datagen # use native, faster - $(MAKE) -C $(TESTDIR) test CC=arm-linux-gnueabi-gcc ZSTDRTTEST= MOREFLAGS="-Werror -static" + $(MAKE) -C $(TESTDIR) test CC=arm-linux-gnueabi-gcc QEMU_SYS=qemu-arm-static ZSTDRTTEST= MOREFLAGS="-Werror -static" + +aarch64test: + $(MAKE) -C $(TESTDIR) datagen # use native, faster + $(MAKE) -C $(TESTDIR) test CC=aarch64-linux-gnu-gcc QEMU_SYS=qemu-aarch64-static ZSTDRTTEST= MOREFLAGS="-Werror -static" ppctest: clean $(MAKE) -C $(TESTDIR) datagen # use native, faster - $(MAKE) -C $(TESTDIR) test CC=powerpc-linux-gnu-gcc ZSTDRTTEST= MOREFLAGS="-Werror -Wno-attributes -static" + $(MAKE) -C $(TESTDIR) test CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc-static ZSTDRTTEST= MOREFLAGS="-Werror -Wno-attributes -static" ppc64test: clean $(MAKE) -C $(TESTDIR) datagen # use native, faster - $(MAKE) -C $(TESTDIR) test CC=powerpc-linux-gnu-gcc ZSTDRTTEST= MOREFLAGS="-m64 -static" + $(MAKE) -C $(TESTDIR) test CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc64-static ZSTDRTTEST= MOREFLAGS="-m64 -static" usan: clean $(MAKE) test CC=clang MOREFLAGS="-g -fsanitize=undefined" diff --git a/tests/Makefile b/tests/Makefile index 26ae6007..63177f5e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -166,7 +166,7 @@ endif #------------------------------------------------------------------------ ifneq (,$(filter $(HOST_OS),MSYS POSIX)) zstd-playTests: datagen - ZSTD=$(ZSTD) ./playTests.sh $(ZSTDRTTEST) + ZSTD="$(QEMU_SYS) $(ZSTD)" ./playTests.sh $(ZSTDRTTEST) test: test-zstd test-fullbench test-fuzzer test-zbuff test-zstream @@ -184,29 +184,29 @@ test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd test-zstd-nolegacy: zstd-nolegacy zstd-playTests test-fullbench: fullbench datagen - ./fullbench -i1 - ./fullbench -i1 -P0 + $(QEMU_SYS) ./fullbench -i1 + $(QEMU_SYS) ./fullbench -i1 -P0 test-fullbench32: fullbench32 datagen - ./fullbench32 -i1 - ./fullbench32 -i1 -P0 + $(QEMU_SYS) ./fullbench32 -i1 + $(QEMU_SYS) ./fullbench32 -i1 -P0 test-fuzzer: fuzzer - ./fuzzer $(FUZZERTEST) + $(QEMU_SYS) ./fuzzer $(FUZZERTEST) test-fuzzer32: fuzzer32 - ./fuzzer32 $(FUZZERTEST) + $(QEMU_SYS) ./fuzzer32 $(FUZZERTEST) test-zbuff: zbufftest - ./zbufftest $(ZBUFFTEST) + $(QEMU_SYS) ./zbufftest $(ZBUFFTEST) test-zbuff32: zbufftest32 - ./zbufftest32 $(ZBUFFTEST) + $(QEMU_SYS) ./zbufftest32 $(ZBUFFTEST) test-zstream: zstreamtest - ./zstreamtest $(ZBUFFTEST) + $(QEMU_SYS) ./zstreamtest $(ZBUFFTEST) test-zstream32: zstreamtest32 - ./zstreamtest32 $(ZBUFFTEST) + $(QEMU_SYS) ./zstreamtest32 $(ZBUFFTEST) endif diff --git a/tests/playTests.sh b/tests/playTests.sh index ad70538a..1bc835f0 100755 --- a/tests/playTests.sh +++ b/tests/playTests.sh @@ -36,7 +36,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then MD5SUM="md5 -r" fi -$ECHO "\nStarting playTests.sh isWindows=$isWindows" +$ECHO "\nStarting playTests.sh isWindows=$isWindows ZSTD='$ZSTD'" [ -n "$ZSTD" ] || die "ZSTD variable must be defined!" From 0b48a5964708c629f2b0e9cd0b70f047ba4f0c87 Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 13:07:45 +0100 Subject: [PATCH 02/12] .travis.yml: added aarch64test and ppc64test --- .travis.yml | 102 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9396c98d..134b88e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,19 @@ language: c -compiler: gcc matrix: fast_finish: true include: # OS X Mavericks - - os: osx - env: PLATFORM="OS X Mavericks" CMD="make gnu90test && make clean && make test && make clean && make travis-install" + - env: Ubu=OS_X_Mavericks Cmd="make gnu90test && make clean && make test && make clean && make travis-install" + os: osx + + # Container-based Ubuntu 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes) - - os: linux + - env: Ubu=12.04cont Cmd="make test && make clean && make travis-install" + os: linux sudo: false - env: PLATFORM="Ubuntu 12.04 container" CMD="make test && make clean && make travis-install" - - os: linux + + - env: Ubu=12.04cont Cmd="make zlibwrapper && make clean && make -C tests test-zstd-nolegacy && make clean && make clean && make cmaketest && make clean && make -C contrib/pzstd googletest && make -C contrib/pzstd all && make -C contrib/pzstd check && make -C contrib/pzstd clean" + os: linux sudo: false language: cpp install: @@ -22,32 +25,24 @@ matrix: packages: - gcc-4.8 - g++-4.8 - env: PLATFORM="Ubuntu 12.04 container" CMD="make zlibwrapper && make clean && make -C tests test-zstd-nolegacy && make clean && make clean && make cmaketest && make clean && make -C contrib/pzstd googletest && make -C contrib/pzstd all && make -C contrib/pzstd check && make -C contrib/pzstd clean" - - os: linux + + - env: Ubu=12.04cont Cmd="make usan" + os: linux sudo: false - env: PLATFORM="Ubuntu 12.04 container" CMD="make usan" - - os: linux + + - env: Ubu=12.04cont Cmd="make asan" + os: linux sudo: false - env: PLATFORM="Ubuntu 12.04 container" CMD="make asan" + + # Standard Ubuntu 12.04 LTS Server Edition 64 bit - - os: linux + - env: Ubu=12.04 Cmd="make -C programs zstd-small && make -C programs zstd-decompress && make -C programs zstd-compress && make -C programs clean && make -C tests versionsTest" + os: linux sudo: required - env: PLATFORM="Ubuntu 12.04" CMD="make armtest" - addons: - apt: - packages: - - gcc-arm-linux-gnueabi - - libc6-dev-armel-cross - - linux-libc-dev-armel-cross - - binfmt-support - - qemu - - qemu-user-static - - os: linux + + - env: Ubu=12.04 Cmd="make asan32" + os: linux sudo: required - env: PLATFORM="Ubuntu 12.04" CMD="make -C programs zstd-small && make -C programs zstd-decompress && make -C programs zstd-compress && make -C programs clean && make -C tests versionsTest" - - os: linux - sudo: required - env: PLATFORM="Ubuntu 12.04" CMD="make asan32" addons: apt: sources: @@ -55,13 +50,14 @@ matrix: packages: - libc6-dev-i386 - gcc-multilib - - os: linux + + - env: Ubu=12.04 Cmd='cd contrib/pzstd && make googletest && make tsan && make check && make clean && make asan && make check && make clean && cd ../..' + os: linux sudo: required install: - export CXX="g++-6" CC="gcc-6" - export LDFLAGS="-fuse-ld=gold" - export TESTFLAGS='--gtest_filter=-*ExtremelyLarge*' - env: PLATFORM="Ubuntu 12.04" CMD='cd contrib/pzstd && make googletest && make tsan && make check && make clean && make asan && make check && make clean && cd ../..' addons: apt: sources: @@ -69,21 +65,47 @@ matrix: packages: - gcc-6 - g++-6 + + # Ubuntu 14.04 LTS Server Edition 64 bit - - os: linux + - env: Ubu=14.04 Cmd="make armtest && make clean && make aarch64test" + dist: trusty + sudo: required + addons: + apt: + packages: + - qemu-system-arm + - qemu-user-static + - gcc-arm-linux-gnueabi + - libc6-dev-armel-cross + - gcc-aarch64-linux-gnu + - libc6-dev-arm64-cross + + - env: Ubu=14.04 Cmd='make ppctest && make clean && make ppc64test' + dist: trusty + sudo: required + addons: + apt: + packages: + - qemu-system-ppc + - qemu-user-static + - gcc-powerpc-linux-gnu + + - env: Ubu=14.04 Cmd='make -C lib all && CFLAGS="-O1 -g" make -C zlibWrapper valgrindTest && make -C tests valgrindTest' + os: linux dist: trusty sudo: required - env: PLATFORM="Ubuntu 14.04" CMD='make -C lib all && CFLAGS="-O1 -g" make -C zlibWrapper valgrindTest && make -C tests valgrindTest' addons: apt: packages: - valgrind - - os: linux + + - env: Ubu=14.04 Cmd="make gpptest && make clean && make gnu90test && make clean && make c99test && make clean && make gnu99test && make clean && make clangtest && make clean && make -C contrib/pzstd googletest32 && make -C contrib/pzstd all32 && make -C contrib/pzstd check && make -C contrib/pzstd clean" + os: linux dist: trusty sudo: required install: - export CXX="g++-4.8" CC="gcc-4.8" - env: PLATFORM="Ubuntu 14.04" CMD="make gpptest && make clean && make gnu90test && make clean && make c99test && make clean && make gnu99test && make clean && make clangtest && make clean && make -C contrib/pzstd googletest32 && make -C contrib/pzstd all32 && make -C contrib/pzstd check && make -C contrib/pzstd clean" addons: apt: packages: @@ -93,19 +115,21 @@ matrix: - gcc-4.8-multilib - g++-4.8 - g++-4.8-multilib - - os: linux + + - env: Ubu=14.04 Cmd="make -C tests test32" + os: linux dist: trusty sudo: required - env: PLATFORM="Ubuntu 14.04" CMD="make -C tests test32" addons: apt: packages: - libc6-dev-i386 - gcc-multilib - - os: linux + + - env: Ubu=14.04 Cmd="make gcc5test && make clean && make gcc6test" + os: linux dist: trusty sudo: required - env: PLATFORM="Ubuntu 14.04" CMD="make gcc5test && make clean && make gcc6test && sudo apt-get install -y -q qemu-system-ppc binfmt-support qemu-user-static gcc-powerpc-linux-gnu && make clean && make ppctest" addons: apt: sources: @@ -116,8 +140,6 @@ matrix: - gcc-5-multilib - gcc-6 - gcc-6-multilib - exclude: - - compiler: gcc script: - - sh -c "$CMD" + - sh -c "$Cmd" From c89c74ee91d0f31f62c1411b7e69c0c1add1f13a Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 13:41:18 +0100 Subject: [PATCH 03/12] updated .gitignore --- build/.gitignore | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/build/.gitignore b/build/.gitignore index 86ed710b..bc8ac94d 100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -1,13 +1,18 @@ -*Copy - # Visual C++ -bin/ +.vs/ +*Copy +*.db +*.opensdf +*.sdf +*.suo +*.user + VS2005/ VS2008/ -VS2010/ -VS2012/ -VS2013/ -VS2015/ +VS2010/bin/ +VS2012/bin/ +VS2013/bin/ +VS2015/bin/ # CMake cmake/ From c7797789508431c58312d6342a08b551f047dd4f Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 15:56:26 +0100 Subject: [PATCH 04/12] updated IntDir and OutDir --- .travis.yml | 3 ++- build/VS2010/datagen/datagen.vcxproj | 5 ++--- build/VS2010/fullbench/fullbench.vcxproj | 5 ++--- build/VS2010/fuzzer/fuzzer.vcxproj | 5 ++--- build/VS2010/zstd/zstd.vcxproj | 5 ++--- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 134b88e2..993acc96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,4 +142,5 @@ matrix: - gcc-6-multilib script: - - sh -c "$Cmd" + - JOB_NUMBER = $(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:' + - [ $JOB_NUMBER -eq 9 ] || [ $JOB_NUMBER -eq 10 ] && sh -c "$Cmd" diff --git a/build/VS2010/datagen/datagen.vcxproj b/build/VS2010/datagen/datagen.vcxproj index 6460de3a..bd8a213d 100644 --- a/build/VS2010/datagen/datagen.vcxproj +++ b/build/VS2010/datagen/datagen.vcxproj @@ -22,7 +22,8 @@ {037E781E-81A6-494B-B1B3-438AB1200523} Win32Proj datagen - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)_$(Configuration)\ + $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ @@ -67,7 +68,6 @@ true false $(IncludePath);$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); - $(Platform)\$(Configuration)\ true @@ -78,7 +78,6 @@ false false $(IncludePath);$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); - $(Platform)\$(Configuration)\ false diff --git a/build/VS2010/fullbench/fullbench.vcxproj b/build/VS2010/fullbench/fullbench.vcxproj index ea0f06e4..67fd62ba 100644 --- a/build/VS2010/fullbench/fullbench.vcxproj +++ b/build/VS2010/fullbench/fullbench.vcxproj @@ -22,7 +22,8 @@ {61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8} Win32Proj fullbench - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)_$(Configuration)\ + $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ @@ -67,7 +68,6 @@ true $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false - $(Platform)\$(Configuration)\ true @@ -78,7 +78,6 @@ false $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false - $(Platform)\$(Configuration)\ false diff --git a/build/VS2010/fuzzer/fuzzer.vcxproj b/build/VS2010/fuzzer/fuzzer.vcxproj index 020e521a..82fc0216 100644 --- a/build/VS2010/fuzzer/fuzzer.vcxproj +++ b/build/VS2010/fuzzer/fuzzer.vcxproj @@ -22,7 +22,8 @@ {6FD4352B-346C-4703-96EA-D4A8B9A6976E} Win32Proj fuzzer - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)_$(Configuration)\ + $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ @@ -67,7 +68,6 @@ true false $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); - $(Platform)\$(Configuration)\ true @@ -78,7 +78,6 @@ false false $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); - $(Platform)\$(Configuration)\ false diff --git a/build/VS2010/zstd/zstd.vcxproj b/build/VS2010/zstd/zstd.vcxproj index 181bbe6d..c7a9ed73 100644 --- a/build/VS2010/zstd/zstd.vcxproj +++ b/build/VS2010/zstd/zstd.vcxproj @@ -78,7 +78,8 @@ {4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C} Win32Proj zstd - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Platform)_$(Configuration)\ + $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ @@ -124,7 +125,6 @@ $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false $(LibraryPath) - $(Platform)\$(Configuration)\ true @@ -137,7 +137,6 @@ $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false $(LibraryPath) - $(Platform)\$(Configuration)\ false From b5d423b6c21f11dbfe71d02c59b6e90577102c2e Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 15:56:50 +0100 Subject: [PATCH 05/12] zstdlib renamed to libzstd --- .../zstdlib.rc => libzstd/libzstd.rc} | 0 .../libzstd.vcxproj} | 19 ++++++++----------- build/VS2010/zstd.sln | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) rename build/VS2010/{zstdlib/zstdlib.rc => libzstd/libzstd.rc} (100%) rename build/VS2010/{zstdlib/zstdlib.vcxproj => libzstd/libzstd.vcxproj} (95%) diff --git a/build/VS2010/zstdlib/zstdlib.rc b/build/VS2010/libzstd/libzstd.rc similarity index 100% rename from build/VS2010/zstdlib/zstdlib.rc rename to build/VS2010/libzstd/libzstd.rc diff --git a/build/VS2010/zstdlib/zstdlib.vcxproj b/build/VS2010/libzstd/libzstd.vcxproj similarity index 95% rename from build/VS2010/zstdlib/zstdlib.vcxproj rename to build/VS2010/libzstd/libzstd.vcxproj index d32b4861..15295c29 100644 --- a/build/VS2010/zstdlib/zstdlib.vcxproj +++ b/build/VS2010/libzstd/libzstd.vcxproj @@ -63,13 +63,14 @@ - + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850} Win32Proj - zstdlib - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + libzstd + $(SolutionDir)bin\$(Platform)_$(Configuration)\ + $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ @@ -112,29 +113,25 @@ true - zstdlib_x86 - $(Platform)\$(Configuration)\ + libzstd_x86 $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false true - zstdlib_x64 - $(Platform)\$(Configuration)\ + libzstd_x64 $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false false - zstdlib_x86 - $(Platform)\$(Configuration)\ + libzstd_x86 $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false false - zstdlib_x64 - $(Platform)\$(Configuration)\ + libzstd_x64 $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false diff --git a/build/VS2010/zstd.sln b/build/VS2010/zstd.sln index 698b8fe5..4840a4d9 100644 --- a/build/VS2010/zstd.sln +++ b/build/VS2010/zstd.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fuzzer", "fuzzer\fuzzer.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench", "fullbench\fullbench.vcxproj", "{61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstdlib", "zstdlib\zstdlib.vcxproj", "{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzstd", "libzstd\libzstd.vcxproj", "{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "datagen", "datagen\datagen.vcxproj", "{037E781E-81A6-494B-B1B3-438AB1200523}" EndProject From cba727ca8cbbb7d5740bf45c07683093c77c8124 Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 15:59:57 +0100 Subject: [PATCH 06/12] updated appveyor.yml --- appveyor.yml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fbdc30c4..e131b2ca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -85,43 +85,43 @@ build_script: ECHO *** Building Visual Studio 2010 %PLATFORM%\%CONFIGURATION% && ECHO *** && msbuild "build\VS2010\zstd.sln" %ADDITIONALPARAM% /m /verbosity:minimal /property:PlatformToolset=v100 /p:ForceImportBeforeCppTargets=%APPVEYOR_BUILD_FOLDER%\build\VS2010\CompileAsCpp.props /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && - DIR build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe && - MD5sum build/VS2010/bin/%PLATFORM%/%CONFIGURATION%/*.exe && + DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe && + MD5sum build/VS2010/bin/%PLATFORM%_%CONFIGURATION%/*.exe && msbuild "build\VS2010\zstd.sln" %ADDITIONALPARAM% /m /verbosity:minimal /property:PlatformToolset=v100 /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && - DIR build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe && - MD5sum build/VS2010/bin/%PLATFORM%/%CONFIGURATION%/*.exe && - COPY build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe tests\fuzzer_VS2010_%PLATFORM%_%CONFIGURATION%.exe && + DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe && + MD5sum build/VS2010/bin/%PLATFORM%_%CONFIGURATION%/*.exe && + COPY build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\fuzzer.exe tests\fuzzer_VS2010_%PLATFORM%_%CONFIGURATION%.exe && ECHO *** && ECHO *** Building Visual Studio 2012 %PLATFORM%\%CONFIGURATION% && ECHO *** && msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v110 /p:ForceImportBeforeCppTargets=%APPVEYOR_BUILD_FOLDER%\build\VS2010\CompileAsCpp.props /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && - DIR build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe && - MD5sum build/VS2010/bin/%PLATFORM%/%CONFIGURATION%/*.exe && + DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe && + MD5sum build/VS2010/bin/%PLATFORM%_%CONFIGURATION%/*.exe && msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v110 /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && - DIR build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe && - MD5sum build/VS2010/bin/%PLATFORM%/%CONFIGURATION%/*.exe && - COPY build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe tests\fuzzer_VS2012_%PLATFORM%_%CONFIGURATION%.exe && + DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe && + MD5sum build/VS2010/bin/%PLATFORM%_%CONFIGURATION%/*.exe && + COPY build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\fuzzer.exe tests\fuzzer_VS2012_%PLATFORM%_%CONFIGURATION%.exe && ECHO *** && ECHO *** Building Visual Studio 2013 %PLATFORM%\%CONFIGURATION% && ECHO *** && msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v120 /p:ForceImportBeforeCppTargets=%APPVEYOR_BUILD_FOLDER%\build\VS2010\CompileAsCpp.props /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && - DIR build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe && - MD5sum build/VS2010/bin/%PLATFORM%/%CONFIGURATION%/*.exe && + DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe && + MD5sum build/VS2010/bin/%PLATFORM%_%CONFIGURATION%/*.exe && msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v120 /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && - DIR build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe && - MD5sum build/VS2010/bin/%PLATFORM%/%CONFIGURATION%/*.exe && - COPY build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe tests\fuzzer_VS2013_%PLATFORM%_%CONFIGURATION%.exe && + DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe && + MD5sum build/VS2010/bin/%PLATFORM%_%CONFIGURATION%/*.exe && + COPY build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\fuzzer.exe tests\fuzzer_VS2013_%PLATFORM%_%CONFIGURATION%.exe && ECHO *** && ECHO *** Building Visual Studio 2015 %PLATFORM%\%CONFIGURATION% && ECHO *** && msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v140 /p:ForceImportBeforeCppTargets=%APPVEYOR_BUILD_FOLDER%\build\VS2010\CompileAsCpp.props /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && - DIR build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe && - MD5sum build/VS2010/bin/%PLATFORM%/%CONFIGURATION%/*.exe && + DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe && + MD5sum build/VS2010/bin/%PLATFORM%_%CONFIGURATION%/*.exe && msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v140 /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && - DIR build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe && - MD5sum build/VS2010/bin/%PLATFORM%/%CONFIGURATION%/*.exe && - COPY build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe tests\fuzzer_VS2015_%PLATFORM%_%CONFIGURATION%.exe && - COPY build\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe tests\ + DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe && + MD5sum build/VS2010/bin/%PLATFORM%_%CONFIGURATION%/*.exe && + COPY build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\fuzzer.exe tests\fuzzer_VS2015_%PLATFORM%_%CONFIGURATION%.exe && + COPY build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe tests\ ) test_script: From 9f26f72f97611f1fe9b34bccaddbaee96b984bc7 Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 16:14:18 +0100 Subject: [PATCH 07/12] added libzstd-dll --- .travis.yml | 4 +- .../libzstd.rc => libzstd-dll/libzstd-dll.rc} | 4 +- build/VS2010/libzstd-dll/libzstd-dll.vcxproj | 225 ++++++++++++++++++ build/VS2010/libzstd-dll/lz4-dll.vcxproj | 175 ++++++++++++++ build/VS2010/libzstd/liblz4.vcxproj | 171 +++++++++++++ build/VS2010/libzstd/libzstd.vcxproj | 19 +- build/VS2010/zstd.sln | 28 ++- 7 files changed, 602 insertions(+), 24 deletions(-) rename build/VS2010/{libzstd/libzstd.rc => libzstd-dll/libzstd-dll.rc} (92%) create mode 100644 build/VS2010/libzstd-dll/libzstd-dll.vcxproj create mode 100644 build/VS2010/libzstd-dll/lz4-dll.vcxproj create mode 100644 build/VS2010/libzstd/liblz4.vcxproj diff --git a/.travis.yml b/.travis.yml index 993acc96..74a9964b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,5 +142,5 @@ matrix: - gcc-6-multilib script: - - JOB_NUMBER = $(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:' - - [ $JOB_NUMBER -eq 9 ] || [ $JOB_NUMBER -eq 10 ] && sh -c "$Cmd" + - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:' + - [ $JOB_NUMBER -eq 9 ] | [ $JOB_NUMBER -eq 10 ] && sh -c "$Cmd" diff --git a/build/VS2010/libzstd/libzstd.rc b/build/VS2010/libzstd-dll/libzstd-dll.rc similarity index 92% rename from build/VS2010/libzstd/libzstd.rc rename to build/VS2010/libzstd-dll/libzstd-dll.rc index de8ecbcf..72ea168d 100644 --- a/build/VS2010/libzstd/libzstd.rc +++ b/build/VS2010/libzstd-dll/libzstd-dll.rc @@ -35,9 +35,9 @@ BEGIN VALUE "CompanyName", "Yann Collet" VALUE "FileDescription", "Fast and efficient compression algorithm" VALUE "FileVersion", ZSTD_VERSION_STRING - VALUE "InternalName", "zstdlib.dll" + VALUE "InternalName", "libzstd.dll" VALUE "LegalCopyright", "Copyright (C) 2013-2016, Yann Collet" - VALUE "OriginalFilename", "zstdlib.dll" + VALUE "OriginalFilename", "libzstd.dll" VALUE "ProductName", "Zstandard" VALUE "ProductVersion", ZSTD_VERSION_STRING END diff --git a/build/VS2010/libzstd-dll/libzstd-dll.vcxproj b/build/VS2010/libzstd-dll/libzstd-dll.vcxproj new file mode 100644 index 00000000..4bf81664 --- /dev/null +++ b/build/VS2010/libzstd-dll/libzstd-dll.vcxproj @@ -0,0 +1,225 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {00000000-94D5-4BF9-8A50-7BD9929A0850} + Win32Proj + libzstd-dll + $(SolutionDir)bin\$(Platform)_$(Configuration)\ + $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ + + + + DynamicLibrary + true + MultiByte + + + DynamicLibrary + true + MultiByte + + + DynamicLibrary + false + true + MultiByte + + + DynamicLibrary + false + true + MultiByte + + + + + + + + + + + + + + + + + + + true + libzstd_x86 + $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); + false + + + true + libzstd_x64 + $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); + false + + + false + libzstd_x86 + $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); + false + + + false + libzstd_x64 + $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); + false + + + + + + Level4 + Disabled + ZSTD_DLL_EXPORT=1;ZSTD_LEGACY_SUPPORT=1;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + true + false + + + Console + true + MachineX86 + + + + + + + Level4 + Disabled + ZSTD_DLL_EXPORT=1;ZSTD_LEGACY_SUPPORT=1;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + ProgramDatabase + false + + + Console + true + + + + + Level4 + + + MaxSpeed + true + true + ZSTD_DLL_EXPORT=1;ZSTD_LEGACY_SUPPORT=1;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + MultiThreaded + ProgramDatabase + All + + + Console + true + true + true + MachineX86 + + + + + Level4 + + + MaxSpeed + true + true + ZSTD_DLL_EXPORT=1;ZSTD_LEGACY_SUPPORT=1;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + false + MultiThreaded + ProgramDatabase + true + true + All + + + Console + true + true + true + + + + + + diff --git a/build/VS2010/libzstd-dll/lz4-dll.vcxproj b/build/VS2010/libzstd-dll/lz4-dll.vcxproj new file mode 100644 index 00000000..ac172870 --- /dev/null +++ b/build/VS2010/libzstd-dll/lz4-dll.vcxproj @@ -0,0 +1,175 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {9800039D-4AAA-43A4-BB78-FEF6F4836927} + Win32Proj + liblz4-dll + $(SolutionDir)bin\$(Platform)_$(Configuration)\ + $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ + liblz4-dll + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + lz4_x86 + $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + + + true + lz4_x64 + $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + true + + + false + lz4_x86 + $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + + + false + lz4_x64 + $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + true + + + + + + Level4 + Disabled + WIN32;_DEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) + true + false + + + true + + + + + + + Level4 + Disabled + WIN32;_DEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) + true + true + /analyze:stacksize295252 %(AdditionalOptions) + + + true + + + + + Level4 + + + MaxSpeed + true + true + WIN32;NDEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) + false + false + + + true + true + true + + + + + Level4 + + + MaxSpeed + true + true + WIN32;NDEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) + false + true + /analyze:stacksize295252 %(AdditionalOptions) + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/VS2010/libzstd/liblz4.vcxproj b/build/VS2010/libzstd/liblz4.vcxproj new file mode 100644 index 00000000..bafc9980 --- /dev/null +++ b/build/VS2010/libzstd/liblz4.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476} + Win32Proj + liblz4 + $(SolutionDir)bin\$(Platform)_$(Configuration)\ + $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + liblz4_x86 + $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + + + true + liblz4_x64 + $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + true + + + false + liblz4_x86 + $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + + + false + liblz4_x64 + $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + true + + + + + + Level4 + Disabled + WIN32;_DEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) + true + false + + + true + + + + + + + Level4 + Disabled + WIN32;_DEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) + true + true + /analyze:stacksize295252 %(AdditionalOptions) + + + true + + + + + Level4 + + + MaxSpeed + true + true + WIN32;NDEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) + false + false + + + true + true + true + + + + + Level4 + + + MaxSpeed + true + true + WIN32;NDEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) + false + true + /analyze:stacksize295252 %(AdditionalOptions) + + + true + true + true + + + + + + + + + + + + + + + + + + + diff --git a/build/VS2010/libzstd/libzstd.vcxproj b/build/VS2010/libzstd/libzstd.vcxproj index 15295c29..11a608e0 100644 --- a/build/VS2010/libzstd/libzstd.vcxproj +++ b/build/VS2010/libzstd/libzstd.vcxproj @@ -62,9 +62,6 @@ - - - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850} Win32Proj @@ -74,23 +71,23 @@ - DynamicLibrary + StaticLibrary true MultiByte - DynamicLibrary + StaticLibrary true MultiByte - DynamicLibrary + StaticLibrary false true MultiByte - DynamicLibrary + StaticLibrary false true MultiByte @@ -113,25 +110,25 @@ true - libzstd_x86 + libzstd_static_x86 $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false true - libzstd_x64 + libzstd_static_x64 $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false false - libzstd_x86 + libzstd_static_x86 $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false false - libzstd_x64 + libzstd_static_x64 $(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath); false diff --git a/build/VS2010/zstd.sln b/build/VS2010/zstd.sln index 4840a4d9..116f1c75 100644 --- a/build/VS2010/zstd.sln +++ b/build/VS2010/zstd.sln @@ -7,9 +7,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fuzzer", "fuzzer\fuzzer.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench", "fullbench\fullbench.vcxproj", "{61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "datagen", "datagen\datagen.vcxproj", "{037E781E-81A6-494B-B1B3-438AB1200523}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzstd", "libzstd\libzstd.vcxproj", "{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "datagen", "datagen\datagen.vcxproj", "{037E781E-81A6-494B-B1B3-438AB1200523}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzstd-dll", "libzstd-dll\libzstd-dll.vcxproj", "{00000000-94D5-4BF9-8A50-7BD9929A0850}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -43,14 +45,6 @@ Global {61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}.Release|Win32.Build.0 = Release|Win32 {61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}.Release|x64.ActiveCfg = Release|x64 {61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}.Release|x64.Build.0 = Release|x64 - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|Win32.ActiveCfg = Debug|Win32 - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|Win32.Build.0 = Debug|Win32 - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.ActiveCfg = Debug|x64 - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.Build.0 = Debug|x64 - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.ActiveCfg = Release|Win32 - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.Build.0 = Release|Win32 - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.ActiveCfg = Release|x64 - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.Build.0 = Release|x64 {037E781E-81A6-494B-B1B3-438AB1200523}.Debug|Win32.ActiveCfg = Debug|Win32 {037E781E-81A6-494B-B1B3-438AB1200523}.Debug|Win32.Build.0 = Debug|Win32 {037E781E-81A6-494B-B1B3-438AB1200523}.Debug|x64.ActiveCfg = Debug|x64 @@ -59,6 +53,22 @@ Global {037E781E-81A6-494B-B1B3-438AB1200523}.Release|Win32.Build.0 = Release|Win32 {037E781E-81A6-494B-B1B3-438AB1200523}.Release|x64.ActiveCfg = Release|x64 {037E781E-81A6-494B-B1B3-438AB1200523}.Release|x64.Build.0 = Release|x64 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|Win32.ActiveCfg = Debug|Win32 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|Win32.Build.0 = Debug|Win32 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.ActiveCfg = Debug|x64 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.Build.0 = Debug|x64 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.ActiveCfg = Release|Win32 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.Build.0 = Release|Win32 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.ActiveCfg = Release|x64 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.Build.0 = Release|x64 + {00000000-94D5-4BF9-8A50-7BD9929A0850}.Debug|Win32.ActiveCfg = Debug|Win32 + {00000000-94D5-4BF9-8A50-7BD9929A0850}.Debug|Win32.Build.0 = Debug|Win32 + {00000000-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.ActiveCfg = Debug|x64 + {00000000-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.Build.0 = Debug|x64 + {00000000-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.ActiveCfg = Release|Win32 + {00000000-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.Build.0 = Release|Win32 + {00000000-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.ActiveCfg = Release|x64 + {00000000-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 15d9815a1831adcc54de6cdc9470bab185d277bd Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 16:39:17 +0100 Subject: [PATCH 08/12] fixed .travis.yml --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74a9964b..2ea02ce4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -143,4 +143,8 @@ matrix: script: - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:' - - [ $JOB_NUMBER -eq 9 ] | [ $JOB_NUMBER -eq 10 ] && sh -c "$Cmd" + - | + if [ $JOB_NUMBER -eq 9 || $JOB_NUMBER -eq 10 ]; then + sh -c "$Cmd" + fi + From e392b1fec0ff8d40ea7a20df934f976ebd4e52fd Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 16:52:51 +0100 Subject: [PATCH 09/12] fixed .travis.yml (2) --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ea02ce4..0d8aa206 100644 --- a/.travis.yml +++ b/.travis.yml @@ -143,8 +143,4 @@ matrix: script: - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:' - - | - if [ $JOB_NUMBER -eq 9 || $JOB_NUMBER -eq 10 ]; then - sh -c "$Cmd" - fi - + - if [ $JOB_NUMBER -eq 9 ] || [ $JOB_NUMBER -eq 10 ]; then sh -c "$Cmd"; fi From 672dc775dc4be3c2ca2477d2d456175ed1f411d6 Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 16:58:39 +0100 Subject: [PATCH 10/12] fixed .travis.yml (3) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0d8aa206..2050d54c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,5 +142,5 @@ matrix: - gcc-6-multilib script: - - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:' + - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:') - if [ $JOB_NUMBER -eq 9 ] || [ $JOB_NUMBER -eq 10 ]; then sh -c "$Cmd"; fi From eb977a42ef9c253109d2784abf2c8bca78986d2b Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 17:26:58 +0100 Subject: [PATCH 11/12] "file" moved to tests/Makefile --- tests/Makefile | 1 + tests/playTests.sh | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 63177f5e..c931adbe 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -166,6 +166,7 @@ endif #------------------------------------------------------------------------ ifneq (,$(filter $(HOST_OS),MSYS POSIX)) zstd-playTests: datagen + file $(ZSTD) ZSTD="$(QEMU_SYS) $(ZSTD)" ./playTests.sh $(ZSTDRTTEST) test: test-zstd test-fullbench test-fuzzer test-zbuff test-zstream diff --git a/tests/playTests.sh b/tests/playTests.sh index 1bc835f0..a50604b7 100755 --- a/tests/playTests.sh +++ b/tests/playTests.sh @@ -40,8 +40,6 @@ $ECHO "\nStarting playTests.sh isWindows=$isWindows ZSTD='$ZSTD'" [ -n "$ZSTD" ] || die "ZSTD variable must be defined!" -file $ZSTD - $ECHO "\n**** simple tests **** " ./datagen > tmp From f00e66a63d0aeadf2834648018ffdc6fd555ebed Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 14 Nov 2016 18:07:17 +0100 Subject: [PATCH 12/12] restore all Travis tests --- .travis.yml | 3 +- build/VS2010/libzstd-dll/lz4-dll.vcxproj | 175 ----------------------- build/VS2010/libzstd/liblz4.vcxproj | 171 ---------------------- 3 files changed, 2 insertions(+), 347 deletions(-) delete mode 100644 build/VS2010/libzstd-dll/lz4-dll.vcxproj delete mode 100644 build/VS2010/libzstd/liblz4.vcxproj diff --git a/.travis.yml b/.travis.yml index 2050d54c..7866e5ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -143,4 +143,5 @@ matrix: script: - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:') - - if [ $JOB_NUMBER -eq 9 ] || [ $JOB_NUMBER -eq 10 ]; then sh -c "$Cmd"; fi + # - if [ $JOB_NUMBER -eq 9 ] || [ $JOB_NUMBER -eq 10 ]; then sh -c "$Cmd"; fi + - sh -c "$Cmd" diff --git a/build/VS2010/libzstd-dll/lz4-dll.vcxproj b/build/VS2010/libzstd-dll/lz4-dll.vcxproj deleted file mode 100644 index ac172870..00000000 --- a/build/VS2010/libzstd-dll/lz4-dll.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {9800039D-4AAA-43A4-BB78-FEF6F4836927} - Win32Proj - liblz4-dll - $(SolutionDir)bin\$(Platform)_$(Configuration)\ - $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ - liblz4-dll - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - lz4_x86 - $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - - - true - lz4_x64 - $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - true - - - false - lz4_x86 - $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - - - false - lz4_x64 - $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - true - - - - - - Level4 - Disabled - WIN32;_DEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) - true - false - - - true - - - - - - - Level4 - Disabled - WIN32;_DEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) - true - true - /analyze:stacksize295252 %(AdditionalOptions) - - - true - - - - - Level4 - - - MaxSpeed - true - true - WIN32;NDEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) - false - false - - - true - true - true - - - - - Level4 - - - MaxSpeed - true - true - WIN32;NDEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) - false - true - /analyze:stacksize295252 %(AdditionalOptions) - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/VS2010/libzstd/liblz4.vcxproj b/build/VS2010/libzstd/liblz4.vcxproj deleted file mode 100644 index bafc9980..00000000 --- a/build/VS2010/libzstd/liblz4.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476} - Win32Proj - liblz4 - $(SolutionDir)bin\$(Platform)_$(Configuration)\ - $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\ - - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - liblz4_x86 - $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - - - true - liblz4_x64 - $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - true - - - false - liblz4_x86 - $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - - - false - liblz4_x64 - $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - true - - - - - - Level4 - Disabled - WIN32;_DEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) - true - false - - - true - - - - - - - Level4 - Disabled - WIN32;_DEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) - true - true - /analyze:stacksize295252 %(AdditionalOptions) - - - true - - - - - Level4 - - - MaxSpeed - true - true - WIN32;NDEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) - false - false - - - true - true - true - - - - - Level4 - - - MaxSpeed - true - true - WIN32;NDEBUG;LZ4_DLL_EXPORT=1;%(PreprocessorDefinitions) - false - true - /analyze:stacksize295252 %(AdditionalOptions) - - - true - true - true - - - - - - - - - - - - - - - - - - -