From 6a6a2d2ec31dcae31b4df333539050377f4e883d Mon Sep 17 00:00:00 2001 From: Guillaume Voirin Date: Fri, 26 Jun 2015 01:43:49 +0200 Subject: [PATCH 01/39] Create .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..3bc8334 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: c +compiler: + - clang + - gcc From 0ac0d9bb5ac9a8095401221278c503da0773cced Mon Sep 17 00:00:00 2001 From: Guillaume Voirin Date: Fri, 26 Jun 2015 01:49:13 +0200 Subject: [PATCH 02/39] Update .travis.yml --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3bc8334..e125ec0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,12 @@ language: c compiler: - clang - gcc + +before_install: + - sudo apt-get -qq --yes install premake5 + +before_script: + - premake5 gmake + +script: + - make From c20cddd3ebd7f4d6af8dd4de41dbca4a2e15221d Mon Sep 17 00:00:00 2001 From: Guillaume Voirin Date: Fri, 26 Jun 2015 01:51:05 +0200 Subject: [PATCH 03/39] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e125ec0..498f1e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - sudo apt-get -qq --yes install premake5 before_script: - - premake5 gmake + - cd build && premake5 gmake script: - make From 1d6cf55981b80142800f63a96beef09301c3c200 Mon Sep 17 00:00:00 2001 From: Guillaume Voirin Date: Fri, 26 Jun 2015 02:03:47 +0200 Subject: [PATCH 04/39] Update .travis.yml --- .travis.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 498f1e8..5c4eb5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,15 @@ language: c -compiler: - - clang - - gcc + +# compiler: +# - clang +# - gcc -before_install: - - sudo apt-get -qq --yes install premake5 +# before_install: +# - sudo apt-get -qq --yes install premake5 -before_script: - - cd build && premake5 gmake +# before_script: +# - cd build && premake5 gmake script: - - make + - cd src && gcc *.c + - cd src && clang *.c From b5e4c6d4c64a787162ecd5a870fa15a8baa8ae07 Mon Sep 17 00:00:00 2001 From: Guillaume Voirin Date: Fri, 26 Jun 2015 02:14:56 +0200 Subject: [PATCH 05/39] Update .travis.yml --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5c4eb5e..08b54ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,5 +11,7 @@ language: c # - cd build && premake5 gmake script: - - cd src && gcc *.c - - cd src && clang *.c + - cd src + - gcc -std=c99 *.c ../test/src/*.c ../test/src/cputime/src/*.c + - clang *.c ../test/src/*.c ../test/src/cputime/src/*.c + - rm a.out From eb37d86515d7b7dd527bf56e72a1781a8233fa43 Mon Sep 17 00:00:00 2001 From: Guillaume Voirin Date: Fri, 26 Jun 2015 11:27:47 +0200 Subject: [PATCH 06/39] Updated .travis.yml --- .travis.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08b54ac..6244092 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,10 @@ language: c -# compiler: -# - clang -# - gcc - -# before_install: -# - sudo apt-get -qq --yes install premake5 - -# before_script: -# - cd build && premake5 gmake - script: - - cd src - - gcc -std=c99 *.c ../test/src/*.c ../test/src/cputime/src/*.c - - clang *.c ../test/src/*.c ../test/src/cputime/src/*.c - - rm a.out + - cd build + - wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-linux.tar.gz + - tar zxvf premake-5.0.0.alpha4-linux.tar.gz + - ln -sf premake-5.0.0.alpha4-linux/premake5 premake5 + - ./premake5 gmake + - make clean + - make From 77518434fe5fe7a2c727da609f80aab15b38c68c Mon Sep 17 00:00:00 2001 From: Guillaume Voirin Date: Fri, 26 Jun 2015 11:29:51 +0200 Subject: [PATCH 07/39] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6244092..9dd4df2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ script: - cd build - wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-linux.tar.gz - tar zxvf premake-5.0.0.alpha4-linux.tar.gz - - ln -sf premake-5.0.0.alpha4-linux/premake5 premake5 - ./premake5 gmake - make clean - make From d208cf4afea8d3e9681b448a277f496678e01c2f Mon Sep 17 00:00:00 2001 From: Guillaume Voirin Date: Fri, 26 Jun 2015 11:32:06 +0200 Subject: [PATCH 08/39] Update premake5.lua --- build/premake5.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/premake5.lua b/build/premake5.lua index 4dbaa0c..3e3d105 100644 --- a/build/premake5.lua +++ b/build/premake5.lua @@ -44,6 +44,7 @@ os.execute("git submodule update --init --recursive") solution "SpookyHash" configurations { "Release" } + buildoptions { "-std=c99" } flags { "OptimizeSpeed", "NoFramePointer", "LinkTimeOptimization" } project "spookyhash-static" @@ -71,4 +72,4 @@ solution "SpookyHash" "../test/src/**.h", "../test/src/**.c" } - links { "spookyhash-static" } \ No newline at end of file + links { "spookyhash-static" } From e7dde0df95a59d71deeeaf762d39063291819ccd Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 13:06:44 +0200 Subject: [PATCH 09/39] Updated CPUTime --- .appveyor.yml | 0 test/src/cputime | 2 +- test/src/test.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..e69de29 diff --git a/test/src/cputime b/test/src/cputime index 9a3b641..23ae0bb 160000 --- a/test/src/cputime +++ b/test/src/cputime @@ -1 +1 @@ -Subproject commit 9a3b64175b5721909e66b0a34a692d5eb25996f1 +Subproject commit 23ae0bb692ca9b2c8dab9dca5fde265a58d8cf81 diff --git a/test/src/test.c b/test/src/test.c index ebaf338..389879b 100644 --- a/test/src/test.c +++ b/test/src/test.c @@ -33,7 +33,7 @@ #include #include "../../src/spookyhash_api.h" #include "../../src/spookyhash.h" -#include "cputime/src/cputime.h" +#include "cputime/src/cputime_api.h" uint64_t m_a; uint64_t m_b; From 30f0a6ccef68e21afb78b9ece8ee74c5df5f94ae Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 16:27:14 +0200 Subject: [PATCH 10/39] Reorganized directories --- .appveyor.yml | 13 +++++++++++++ .gitmodules | 4 ++-- build/premake5.lua | 6 ++++-- test/{src => libs}/cputime | 0 4 files changed, 19 insertions(+), 4 deletions(-) rename test/{src => libs}/cputime (100%) diff --git a/.appveyor.yml b/.appveyor.yml index e69de29..31a8f48 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -0,0 +1,13 @@ +version: 1.0.{build} + +install: + - cmd: cd build + - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip + - cmd: dir + - cmd: 7z x premake5.zip + - cmd: del premake5.zip + +build_script: + - cmd: premake5 vs2010 + - cmd: dir + - cmd: msbuild SpookyHash.sln \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 609bf00..ce2fb4b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "test/src/cputime"] - path = test/src/cputime +[submodule "test/libs/cputime"] + path = test/libs/cputime url = https://github.com/centaurean/cputime.git diff --git a/build/premake5.lua b/build/premake5.lua index 3e3d105..9dea6fd 100644 --- a/build/premake5.lua +++ b/build/premake5.lua @@ -69,7 +69,9 @@ solution "SpookyHash" kind "ConsoleApp" language "C" files { - "../test/src/**.h", - "../test/src/**.c" + "../test/libs/**.h", + "../test/libs/**.c", + "../test/src/*.h", + "../test/src/*.c" } links { "spookyhash-static" } diff --git a/test/src/cputime b/test/libs/cputime similarity index 100% rename from test/src/cputime rename to test/libs/cputime From b702dbc3ed4436b06234ae82b00308c4a4419dec Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 16:33:03 +0200 Subject: [PATCH 11/39] Corrected includes --- test/src/test.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/src/test.c b/test/src/test.c index 389879b..1d567cc 100644 --- a/test/src/test.c +++ b/test/src/test.c @@ -31,9 +31,8 @@ */ #include -#include "../../src/spookyhash_api.h" #include "../../src/spookyhash.h" -#include "cputime/src/cputime_api.h" +#include "../libs/cputime/src/cputime_api.h" uint64_t m_a; uint64_t m_b; From 16c3cce04d17d103a730d471d0fbb2fd6e2bc8db Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 16:35:22 +0200 Subject: [PATCH 12/39] Updated .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 31a8f48..81ee8ab 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.{build} +version: 1.0.6.{build} install: - cmd: cd build From dc8f2e68a14350de8619cb25af7b991c0b705510 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 16:50:49 +0200 Subject: [PATCH 13/39] Updated .appveyor.yml --- .appveyor.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 81ee8ab..34a49d2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,11 +3,17 @@ version: 1.0.6.{build} install: - cmd: cd build - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - - cmd: dir - cmd: 7z x premake5.zip - cmd: del premake5.zip + - cmd: premake5 --version + - ps: wget http://downloads.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-bin.zip?r=http%3A%2F%2Fgnuwin32.sourceforge.net%2Fpackages%2Fmake.htm&ts=1435329768&use_mirror=heanet -OutFile make.zip + - cmd: 7z x make.zip + - cmd: del make.zip + - cmd: cp make-3.81-bin/bin/make.exe . + - cmd: make --version + build_script: - - cmd: premake5 vs2010 - - cmd: dir - - cmd: msbuild SpookyHash.sln \ No newline at end of file + - cmd: premake5 gmake + - cmd: make clean + - cmd: make \ No newline at end of file From 1b499aafac1c02d3c4d55a904a75840cd988cf09 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 17:03:35 +0200 Subject: [PATCH 14/39] Updated .appveyor.yml --- .appveyor.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 34a49d2..eff129b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,13 +5,10 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - cmd: 7z x premake5.zip - cmd: del premake5.zip - - cmd: premake5 --version - - ps: wget http://downloads.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-bin.zip?r=http%3A%2F%2Fgnuwin32.sourceforge.net%2Fpackages%2Fmake.htm&ts=1435329768&use_mirror=heanet -OutFile make.zip + - ps: wget http://downloads.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-bin.zip -OutFile make.zip - cmd: 7z x make.zip - cmd: del make.zip - cmd: cp make-3.81-bin/bin/make.exe . - - cmd: make --version - build_script: - cmd: premake5 gmake From 827dba050dee0d190d31a0f0ab68322137049e2c Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 17:15:00 +0200 Subject: [PATCH 15/39] Updated builds --- .appveyor.yml | 9 +++++---- .travis.yml | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index eff129b..2337ece 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,12 +5,13 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - cmd: 7z x premake5.zip - cmd: del premake5.zip - - ps: wget http://downloads.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-bin.zip -OutFile make.zip - - cmd: 7z x make.zip - - cmd: del make.zip + - ps: wget http://downloads.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-bin.zip + - cmd: 7z x make-3.81-bin.zip + - cmd: del make-3.81-bin.zip - cmd: cp make-3.81-bin/bin/make.exe . build_script: - cmd: premake5 gmake - cmd: make clean - - cmd: make \ No newline at end of file + - cmd: make + - cmd: spookyhash-test \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 9dd4df2..e1ff569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,3 +7,4 @@ script: - ./premake5 gmake - make clean - make + - ./spookyhash-test From c0b07496c2a3f77bea2b9103833ab876c2dcda0d Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 17:44:05 +0200 Subject: [PATCH 16/39] Updated builds --- .appveyor.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2337ece..f46a286 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,13 +5,12 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - cmd: 7z x premake5.zip - cmd: del premake5.zip - - ps: wget http://downloads.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-bin.zip - - cmd: 7z x make-3.81-bin.zip - - cmd: del make-3.81-bin.zip - - cmd: cp make-3.81-bin/bin/make.exe . + - ps: wget https://olex-secure.openlogic.com/content/openlogic/gnumake/3.81/gnumake-3.81-windows-bin.zip --no-check-certificate + - cmd: 7z x gnumake-3.81-windows-bin.zip + - cmd: del gnumake-3.81-windows-bin.zip build_script: - cmd: premake5 gmake - - cmd: make clean - - cmd: make + - cmd: gnumake-3.81/make clean + - cmd: gnumake-3.81/make - cmd: spookyhash-test \ No newline at end of file From 6b1427419b239581b60c165c196456f48965e7c5 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 17:52:47 +0200 Subject: [PATCH 17/39] Updated builds --- .appveyor.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f46a286..defac2e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,12 +5,9 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - cmd: 7z x premake5.zip - cmd: del premake5.zip - - ps: wget https://olex-secure.openlogic.com/content/openlogic/gnumake/3.81/gnumake-3.81-windows-bin.zip --no-check-certificate - - cmd: 7z x gnumake-3.81-windows-bin.zip - - cmd: del gnumake-3.81-windows-bin.zip build_script: - cmd: premake5 gmake - - cmd: gnumake-3.81/make clean - - cmd: gnumake-3.81/make + - cmd: mingw32-make clean + - cmd: mingw32-make - cmd: spookyhash-test \ No newline at end of file From 9188c97ffca07bda89823ee5c6fc95cef40c4903 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 18:23:46 +0200 Subject: [PATCH 18/39] Updated builds --- .appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index defac2e..af2691f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,6 +8,8 @@ install: build_script: - cmd: premake5 gmake - - cmd: mingw32-make clean - - cmd: mingw32-make + - cmd: dir c:/MinGW/ + - cmd: dir c:/MinGW/bin/ + - cmd: c:/MinGW/bin/mingw32-make clean + - cmd: c:/MinGW/bin/mingw32-make - cmd: spookyhash-test \ No newline at end of file From 2807e33c6db1a0e08f910c70fe92f347a78851b6 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 18:37:41 +0200 Subject: [PATCH 19/39] Updated builds --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index af2691f..bd55ee1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,8 +8,8 @@ install: build_script: - cmd: premake5 gmake - - cmd: dir c:/MinGW/ - - cmd: dir c:/MinGW/bin/ - - cmd: c:/MinGW/bin/mingw32-make clean - - cmd: c:/MinGW/bin/mingw32-make + - cmd: dir c:\MinGW + - cmd: dir c:\MinGW\bin + - cmd: c:\MinGW\bin\mingw32-make clean + - cmd: c:\MinGW\bin\mingw32-make - cmd: spookyhash-test \ No newline at end of file From 1d59f3410ea430ffc07971a05bcca2030033e53a Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 18:40:17 +0200 Subject: [PATCH 20/39] Updated README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 6cec96f..02e5ed0 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ The function allows a 128-bit seed. It's named SpookyHash because it was release Centaurean's release of SpookyHash integrates support for big endian platforms and multithreading via context variables. +Branch | Linux | Windows +--- | --- | --- +Master | [![Build Status](https://travis-ci.org/centaurean/spookyhash.svg?branch=master)](https://travis-ci.org/centaurean/spookyhash) | [![Build status](https://ci.appveyor.com/api/projects/status/d3w4v68a5ws27g73/branch/master?svg=true)](https://ci.appveyor.com/project/gpnuma/spookyhash/branch/master) +Dev | | [![Build Status](https://travis-ci.org/centaurean/spookyhash.svg?branch=dev)](https://travis-ci.org/centaurean/spookyhash) | [![Build status](https://ci.appveyor.com/api/projects/status/d3w4v68a5ws27g73/branch/dev?svg=true)](https://ci.appveyor.com/project/gpnuma/spookyhash/branch/dev) + Why use SpookyHash ? -------------------- From fa12647e54dc0af0f92ced075d9a2d91dc17d932 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 18:41:16 +0200 Subject: [PATCH 21/39] Updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 02e5ed0..2dd8d40 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Centaurean's release of SpookyHash integrates support for big endian platforms a Branch | Linux | Windows --- | --- | --- Master | [![Build Status](https://travis-ci.org/centaurean/spookyhash.svg?branch=master)](https://travis-ci.org/centaurean/spookyhash) | [![Build status](https://ci.appveyor.com/api/projects/status/d3w4v68a5ws27g73/branch/master?svg=true)](https://ci.appveyor.com/project/gpnuma/spookyhash/branch/master) -Dev | | [![Build Status](https://travis-ci.org/centaurean/spookyhash.svg?branch=dev)](https://travis-ci.org/centaurean/spookyhash) | [![Build status](https://ci.appveyor.com/api/projects/status/d3w4v68a5ws27g73/branch/dev?svg=true)](https://ci.appveyor.com/project/gpnuma/spookyhash/branch/dev) +Dev | [![Build Status](https://travis-ci.org/centaurean/spookyhash.svg?branch=dev)](https://travis-ci.org/centaurean/spookyhash) | [![Build status](https://ci.appveyor.com/api/projects/status/d3w4v68a5ws27g73/branch/dev?svg=true)](https://ci.appveyor.com/project/gpnuma/spookyhash/branch/dev) Why use SpookyHash ? -------------------- From 5007d52d90b9336b6fea53c9ffaadde71f778142 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 18:45:47 +0200 Subject: [PATCH 22/39] Updated CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c341bb1..d846ff3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Switched to premake 5 * Updated API definitions * Added version information access in the API +* Added build statuses 1.0.5 ----- From f1674aec7fa294e3ec21e54466d4bf0cf3aa6a1e Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 18:47:53 +0200 Subject: [PATCH 23/39] Updated CPUTime --- test/libs/cputime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libs/cputime b/test/libs/cputime index 23ae0bb..9be6a40 160000 --- a/test/libs/cputime +++ b/test/libs/cputime @@ -1 +1 @@ -Subproject commit 23ae0bb692ca9b2c8dab9dca5fde265a58d8cf81 +Subproject commit 9be6a4061682dac4fa59d332ff69529105921ac0 From ae8277268a071664a10542b66279ffef01e996a9 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 19:11:43 +0200 Subject: [PATCH 24/39] Updated builds --- .appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index bd55ee1..1b2c2dc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,8 +8,6 @@ install: build_script: - cmd: premake5 gmake - - cmd: dir c:\MinGW - - cmd: dir c:\MinGW\bin - - cmd: c:\MinGW\bin\mingw32-make clean + - cmd: c:\MinGW\bin\mingw32-make --version - cmd: c:\MinGW\bin\mingw32-make - cmd: spookyhash-test \ No newline at end of file From 36e5e43317fb21307ed3a09e5945ce006bf0baa5 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 19:21:27 +0200 Subject: [PATCH 25/39] Updated builds --- .appveyor.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1b2c2dc..ab2dc01 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,13 +1,13 @@ version: 1.0.6.{build} install: - - cmd: cd build + - cd build - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - - cmd: 7z x premake5.zip - - cmd: del premake5.zip + - 7z x premake5.zip + - del premake5.zip build_script: - - cmd: premake5 gmake - - cmd: c:\MinGW\bin\mingw32-make --version - - cmd: c:\MinGW\bin\mingw32-make - - cmd: spookyhash-test \ No newline at end of file + - premake5 gmake + - SET PATH=C:\MinGW\bin;%PATH% + - mingw32-make --version + - spookyhash-test \ No newline at end of file From 3b8122a3d8733b502f4374fe154f44f7c7e6e9f5 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 19:23:04 +0200 Subject: [PATCH 26/39] Updated builds --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index ab2dc01..b5b5434 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,5 +9,6 @@ install: build_script: - premake5 gmake - SET PATH=C:\MinGW\bin;%PATH% - - mingw32-make --version + - mingw32-make clean + - mingw32-make - spookyhash-test \ No newline at end of file From ec86c381d2ed6550f021be59704a310b73af5632 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 19:34:35 +0200 Subject: [PATCH 27/39] Updated builds --- .appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b5b5434..9bc7c61 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,7 +8,7 @@ install: build_script: - premake5 gmake - - SET PATH=C:\MinGW\bin;%PATH% - - mingw32-make clean - - mingw32-make + - set PATH=C:\MinGW\bin;%PATH% + - ps: mingw32-make clean + - ps: mingw32-make - spookyhash-test \ No newline at end of file From 1136797f4e10a9604b570f665022b8a0043e4e0b Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 20:37:41 +0200 Subject: [PATCH 28/39] Updated builds --- .appveyor.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9bc7c61..3ba45cb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,10 +5,13 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - 7z x premake5.zip - del premake5.zip + - ps: wget http://downloads.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-bin.zip + - cmd: 7z x make-3.81-bin.zip + - cmd: del make-3.81-bin.zip build_script: - premake5 gmake - - set PATH=C:\MinGW\bin;%PATH% - - ps: mingw32-make clean - - ps: mingw32-make + - set PATH=C:\MinGW\bin;C:\projects\spookyhash\make-3.81-bin\bin\;%PATH% + - make clean + - make - spookyhash-test \ No newline at end of file From d3e821db1e09b7283622a709fd685fed41f41cc7 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 20:41:44 +0200 Subject: [PATCH 29/39] Updated builds --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3ba45cb..0f7ffc9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,7 +5,7 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - 7z x premake5.zip - del premake5.zip - - ps: wget http://downloads.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-bin.zip + - ps: wget ftp://ftp.mirrorservice.org/sites/downloads.sourceforge.net/g/gn/gnuwin32/make/3.81/make-3.81-bin.zip - cmd: 7z x make-3.81-bin.zip - cmd: del make-3.81-bin.zip From 6c1c502b298846a3ec42341d48ed7b5831eaf570 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 20:51:01 +0200 Subject: [PATCH 30/39] Updated builds --- .appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0f7ffc9..cf3fcaa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,9 +5,9 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - 7z x premake5.zip - del premake5.zip - - ps: wget ftp://ftp.mirrorservice.org/sites/downloads.sourceforge.net/g/gn/gnuwin32/make/3.81/make-3.81-bin.zip - - cmd: 7z x make-3.81-bin.zip - - cmd: del make-3.81-bin.zip + - wget ftp://ftp.mirrorservice.org/sites/downloads.sourceforge.net/g/gn/gnuwin32/make/3.81/make-3.81-bin.zip + - 7z x make-3.81-bin.zip + - del make-3.81-bin.zip build_script: - premake5 gmake From af5745e9147c699e9054ceb395c26215fb826e14 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 20:53:11 +0200 Subject: [PATCH 31/39] Updated builds --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index cf3fcaa..77b145e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,7 +5,7 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - 7z x premake5.zip - del premake5.zip - - wget ftp://ftp.mirrorservice.org/sites/downloads.sourceforge.net/g/gn/gnuwin32/make/3.81/make-3.81-bin.zip + - ps: wget http://www.mirrorservice.org/sites/downloads.sourceforge.net/g/gn/gnuwin32/make/3.81/make-3.81-bin.zip - 7z x make-3.81-bin.zip - del make-3.81-bin.zip From 3fc2712c2c8df42099e37d9aca6a8873e7f51ebf Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 20:55:51 +0200 Subject: [PATCH 32/39] Updated builds --- .appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 77b145e..5ca162d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,9 +5,9 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - 7z x premake5.zip - del premake5.zip - - ps: wget http://www.mirrorservice.org/sites/downloads.sourceforge.net/g/gn/gnuwin32/make/3.81/make-3.81-bin.zip - - 7z x make-3.81-bin.zip - - del make-3.81-bin.zip + - ps: wget http://www.mirrorservice.org/sites/downloads.sourceforge.net/g/gn/gnuwin32/make/3.81/make-3.81-bin.zip -OutFile make.zip + - 7z x make.zip + - del make.zip build_script: - premake5 gmake From 98f992e6cd8f2f187e2eff2042542749e27b94d8 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 20:57:31 +0200 Subject: [PATCH 33/39] Updated builds --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5ca162d..efbdf8d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -11,7 +11,7 @@ install: build_script: - premake5 gmake - - set PATH=C:\MinGW\bin;C:\projects\spookyhash\make-3.81-bin\bin\;%PATH% + - set PATH=C:\MinGW\bin;C:\projects\spookyhash\bin\;%PATH% - make clean - make - spookyhash-test \ No newline at end of file From 0800b2773d15b37a97571d9f0bf612297c504612 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 20:58:36 +0200 Subject: [PATCH 34/39] Updated builds --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index efbdf8d..dfefa5f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,6 +7,7 @@ install: - del premake5.zip - ps: wget http://www.mirrorservice.org/sites/downloads.sourceforge.net/g/gn/gnuwin32/make/3.81/make-3.81-bin.zip -OutFile make.zip - 7z x make.zip + - dir - del make.zip build_script: From 5dc6d13b2fedfc572d02c39c184060d4a90ceb27 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 20:59:36 +0200 Subject: [PATCH 35/39] Updated builds --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index dfefa5f..a87cafa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,7 +12,7 @@ install: build_script: - premake5 gmake - - set PATH=C:\MinGW\bin;C:\projects\spookyhash\bin\;%PATH% + - set PATH=C:\MinGW\bin;C:\projects\spookyhash\build\bin\;%PATH% - make clean - make - spookyhash-test \ No newline at end of file From c37382057aac2d21763b5aa066262c42696f1065 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 21:14:46 +0200 Subject: [PATCH 36/39] Updated builds --- .appveyor.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a87cafa..ac0c236 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,14 +5,8 @@ install: - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip - 7z x premake5.zip - del premake5.zip - - ps: wget http://www.mirrorservice.org/sites/downloads.sourceforge.net/g/gn/gnuwin32/make/3.81/make-3.81-bin.zip -OutFile make.zip - - 7z x make.zip - - dir - - del make.zip build_script: - - premake5 gmake - - set PATH=C:\MinGW\bin;C:\projects\spookyhash\build\bin\;%PATH% - - make clean - - make + - premake5 vs2013 + - msbuild SpookyHash.sln - spookyhash-test \ No newline at end of file From 84ea542de232de9667cfd6378234ca3cb6cb5244 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 21:22:37 +0200 Subject: [PATCH 37/39] Updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2dd8d40..5fb3051 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ To build a static and dynamic library, as well as a test binary of SpookyHash on or alternatively, on windows for example : - premake5.exe vs2010 + premake5.exe vs2013 Quick start ----------- From f3b8e5ef4e77ac2f98e4556f6bfc221b77668b15 Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 22:01:32 +0200 Subject: [PATCH 38/39] Updated builds --- .appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ac0c236..0cd25c6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,5 +8,4 @@ install: build_script: - premake5 vs2013 - - msbuild SpookyHash.sln - - spookyhash-test \ No newline at end of file + - msbuild SpookyHash.sln \ No newline at end of file From 11374149fe0faea6f729f5abc184926e10ead00b Mon Sep 17 00:00:00 2001 From: gpnuma Date: Fri, 26 Jun 2015 22:17:44 +0200 Subject: [PATCH 39/39] Updated CPUTime --- test/libs/cputime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libs/cputime b/test/libs/cputime index 9be6a40..d435d91 160000 --- a/test/libs/cputime +++ b/test/libs/cputime @@ -1 +1 @@ -Subproject commit 9be6a4061682dac4fa59d332ff69529105921ac0 +Subproject commit d435d91b872a4824fb507a02d0d1814ed3e791b0