Merge 5d16570 into 9bee086

Author: sgeto

.gitignore

@@ -15,4 +15,16 @@ tests/sched.h
 tests/semaphore.h
 tests/benchlib.o
 tests/SIZES.*
-tests/*.log
+tests/*.log
+config\.status
+config\.log
+config\.h
+config\.h\.in~
+autom4te\.cache/
+GNUmakefile
+!contrib/QueueUserAPCEx/*makefile
+PTHREADS-BUILT/
+PTHREADS-BUILT-MinGW/
+*.sys
+*.inlined_static_stamp
+pthreads-w32-*-release

.travis.yml

@@ -0,0 +1,66 @@
+# See YAML format https://en.wikipedia.org/wiki/YAML
+# See Travis CI (Continuous Integration) https://docs.travis-ci.com/
+
+
+language: cpp
+# XXX - only build my branch
+branches:
+  only:
+  - privat
+  - CI
+
+env:
+  global:
+    - CODECOV_TOKEN=:1eef4895-a479-44ae-aade-af4d1c5dc286
+
+env:
+  - PLATFORM="mingw64" BITSIZE=64 HOST="x86_64-w64-mingw32"
+  - PLATFORM="mingw32" BITSIZE=32 HOST="i686-w64-mingw32"
+
+addons:
+  apt:
+    packages:
+      - mingw-w64
+
+before_script:
+  - export CC=$HOST-gcc CXX=$HOST-g++
+  - export GNUMAKEFLAGS='--jobs --no-print-directory --environment-overrides --warn-undefined-variables'
+script:
+  # - autoreconf -iv > build.log 2>&1 || (cat build.log && exit 1)
+  - ./configure --host=$HOST >> build.log 2>&1 || (cat build.log && exit 1)
+  - make all VERBOSE=1 >> build.log 2>&1 || (cat build.log && exit 1)
+  # - make dist >> build.log 2>&1 || (cat build.log && exit 1)
+
+after_success:
+  - curl --upload-file ./build.log https://transfer.sh/build.log
+
+before_deploy: echo 'ready?'
+
+deploy:
+# Don't delete build artifacts
+  skip_cleanup: true
+# GitHub Releases works only for tags, not for branches!
+  provider: releases
+  api_key:
+    secure: tS2Xqo/H4LZo2iI0Ow8ckqbJPRi56Yzk3xvBIrDto2Lu9kLawNpJj+C5NGeHlq2dIjg7syVVfjPk+5HLTsHsK4CPzjIggxsqRWRj0GkO0Wpw03pQuM1zpFmgJBo1vn7roGYJKmYwiEL81ts3Cc8UoBEXAOyR8LGYGYTP8AAZPqYLttfiZABBoBU+3mOetlI5iknKvhm/1oUSsP87yEIgBbdccWXXtSNUCrjudFl4+ypvQhXufLZE63h+R29OeVDYYw7LUWU59TPT4tTHYaopHB2D9TRT1PDLQ01IK3rGwhRzkr6FmQBJDdnki4v2V+uVcdgveJmkkorKg53fOGFdMiahipkRQo6RECQdehw2xMLsZlTZfL6mGCZAX9/7vs+qeXwWjmy1VWihuQCE5Ds4R3BeVAhV4zqcRlFNgYm2INm2kSJTW1rLDaS0uD5/dDhOC1OPATPsLJcdyiJ5LppkOrgMHD809ETP0KSmweXZsmx/sHISXrFvPF/O5r5eGxIyYfFce9hm0UDm7EoUIPH2j0FWp9pxCx0UKDRsKE8285XLB25C/3RPDXLpzja0xzEBUshnVTCP2jO9bwTTJCtJSufr/0FkWJo6XA9xVwSm11UMnhu1ZfXIuCZrAW/kKhFZcaqC6pGVJ9jJvEPABHARJXPNXMKtOBJps9nV3PvWEnI=
+# enable wildcards
+  file_glob: true
+  file:
+    - "example.*.tar.gz"
+    - "example-1.*.zip"
+  on:
+    condition: $TRAVIS_OS_NAME = "linux"
+    tags: true
+    repo: sgeto/example
+
+notifications:
+# Pull Request builds do not trigger email notifications.
+  email:
+    recipients:
+    - autostart.ini@gmail
+    template:
+      - "Pthreads-win32-build #%{build_number} (%{commit} by %{author}): %{message}"
+      - "See details at %{build_url}"
+# change: send a notification when the build status changes (default)
+    on_success: change
+    on_failure: always

COPYING

@@ -32,7 +32,7 @@ Pthreads-win32 is covered by the GNU Lesser General Public License
     A copy of the GNU Lesser General Public License is distributed with
     pthreads-win32 under the filename:
 
-	    COPYING.FSF
+	    LICENSE.lgpl-2.1
 
     You should have received a copy of the version 2.1 GNU Lesser General
     Public License with pthreads-win32; if not, write to:

GNUmakefile.in

@@ -39,10 +39,10 @@ builddir = @builddir@
 VPATH = @srcdir@
 
 # FIXME: Replace these path name references with autoconf standards.
-DESTROOT = ../PTHREADS-BUILT
-DLLDEST	= $(DESTROOT)/bin
-LIBDEST	= $(DESTROOT)/lib
-HDRDEST	= $(DESTROOT)/include
+DESTROOT = PTHREADS-BUILT
+DLLDEST  = $(DESTROOT)/bin
+LIBDEST  = $(DESTROOT)/lib
+HDRDEST  = $(DESTROOT)/include
 # i.e.
 #
 prefix = @prefix@
@@ -168,7 +168,7 @@ GCE_CFLAGS	= $(PTW32_FLAGS) -mthreads
 ## Mingw
 #MAKE		?= make
 DEFS = @DEFS@ -DPTW32_BUILD
-CFLAGS	= $(OPT) $(XOPT) $(ARCH) -I. -I${srcdir} $(DEFS) -Wall
+CFLAGS	= $(OPT) $(XOPT) $(ARCH) -I. -I${srcdir} $(DEFS) -Wall 
 
 OBJEXT = @OBJEXT@
 RESEXT = @OBJEXT@
@@ -201,6 +201,7 @@ PTHREAD_DEF = pthread.def
 help:
 	@ echo "Run one of the following command lines:"
 	@ echo "$(MAKE) clean all                      (build targets GC, GCE, GC-static, GCE-static)"
+	@ echo "$(MAKE) clean install                  (to install targets GC, GCE, GC-static, GCE-static ["$(MAKE) clean all" must be run first!!!])"
 	@ echo "$(MAKE) clean all-tests                (build and test all non-debug targets below)"
 	@ echo "$(MAKE) clean GC                       (to build the GNU C dll with C cleanup code)"
 	@ echo "$(MAKE) clean GC-debug                 (to build the GNU C debug dll with C cleanup code)"