Merge pull request #1193 from Kampbell/AppVeyorAndTravis

AppVeyor and Travis: finalization for Data/MySQL & Data/PostgreSQL
2025-10-23 08:31:43 +02:00 · 2016-03-13 21:37:36 -07:00
parent 2301888296 01c174a97a
commit cf137839cb
8 changed files with 64 additions and 67 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,12 +43,12 @@ env:
    
 before_script:
 - echo ${TEST_NAME}
- - sqlite3 -version
 - chmod 755 ./travis/Linux/runtests.sh
 - chmod 755 ./travis/OSX/runtests.sh
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql -u root -e 'create database pocotestdb;'; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql --version; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then postgres --version; fi
+ - sqlite3 -version

 matrix:
  fast_finish: true
@@ -61,7 +61,7 @@ matrix:
        - export CC="clang"
        - export CXX="clang++"
        - clang++ -x c++ /dev/null -dM -E
-        - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 && sudo make install
+        - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install
        - ./travis/OSX/runtests.sh

    - env:    TEST_NAME="Linux gcc 4.6 (make) bundled"
--- a/Data/MySQL/testsuite/src/SQLExecutor.cpp
+++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp
@@ -27,10 +27,14 @@
 #include "Poco/Data/MySQL/Connector.h"
 #include "Poco/Data/MySQL/MySQLException.h"

+#include <my_global.h>
 #include <mysql.h>
 #include <iostream>
 #include <limits>

+#ifdef max
+#undef max
+#endif

 using namespace Poco::Data;
 using namespace Poco::Data::Keywords;
--- a/20
+++ b/20
@@ -80,10 +80,7 @@ all: libexecs tests samples
 INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)

 COMPONENTS =  CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL
-COMPONENTS += Data Data/SQLite Data/ODBC Data/MySQL
-ifneq ($(OSNAME), Cygwin)
-COMPONENTS += Data/PostgreSQL 
-endif
+COMPONENTS += Data Data/ODBC Data/SQLite Data/MySQL Data/PostgreSQL
 COMPONENTS += MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF

 cppunit:
@@ -113,18 +110,12 @@ endif

 # -------------------------------------------------------------------------------------------------------------------------------------
 libexecs =  Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec 
-libexecs += Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec
-ifneq ($(OSNAME), Cygwin)
-libexecs += Data/PostgreSQL-libexec
-endif
+libexecs += Data-libexec  Data/ODBC-libexec Data/SQLite-libexec Data/MySQL-libexec Data/PostgreSQL-libexec
 libexecs += MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec

 # -------------------------------------------------------------------------------------------------------------------------------------
 tests    =  Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests
-tests    += Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests
-ifneq ($(OSNAME), Cygwin)
-tests	 += Data/PostgreSQL-tests
-endif
+tests    += Data-tests Data/ODBC-tests  Data/SQLite-tests Data/MySQL-tests Data/PostgreSQL-tests
 tests	 += MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests

 # -------------------------------------------------------------------------------------------------------------------------------------
@@ -134,10 +125,7 @@ samples  += MongoDB-samples Zip-samples PageCompiler-samples PDF-samples

 # -------------------------------------------------------------------------------------------------------------------------------------
 cleans   =  Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean 
-cleans   += Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean
-ifneq ($(OSNAME), Cygwin)
-cleans	 += Data/PostgreSQL-clean
-endif
+cleans   += Data-clean Data/ODBC-clean Data/SQLite-clean Data/MySQL-clean Data/PostgreSQL-clean
 cleans	 += MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean

 # -------------------------------------------------------------------------------------------------------------------------------------
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,6 @@ cache:
  - C:\OpenSSL-Win32
  - C:\OpenSSL-Win64
  - C:\Program Files (x86)\PostgreSQL\9.4
-  - C:\Program Files\PostgreSQL\9.4
  
 hosts:
  localhost: 127.0.0.1
@@ -207,6 +206,8 @@ install:
   
 before_build:
  - ps: |
+      if ($env:builder -eq "cmake")
+      {
        if ($env:vsver -eq "110")
        {
          $vspath= convert-path $env:VS110COMNTOOLS\..\..\VC\bin; $yyyy='2010'
@@ -235,9 +236,12 @@ before_build:
        }
        popd
        write-host "`nVisual Studio $yyyy CLI variables set." -ForegroundColor Yellow
+      }
  
 # -------------------------------------------------------------------------------------------  
 # MySQL
+#        & C:\cygwin\bin\ls -lR $env:MYSQL32
+#        & C:\cygwin\bin\ls -lR $env:MYSQL64
 # -------------------------------------------------------------------------------------------  
  - ps: |
      if ($env:platform -eq "Win32")
@@ -250,7 +254,6 @@ before_build:
          $to   = $env:MYSQL32 + "\bin\libmysql.dll"
          copy $from $to
        }
-        & C:\cygwin\bin\ls -lR $env:MYSQL32
      }
      if ($env:platform -eq "x64")
      {
@@ -262,7 +265,6 @@ before_build:
          $to   = $env:MYSQL64 + "\bin\libmysql.dll"
          copy $from $to
        }
-        & C:\cygwin\bin\ls -lR $env:MYSQL64
      }
      $env:MYSQL_PWD="Password12!"
      $cmd = 'mysql -e "create database pocotestdb;" --user=root';
@@ -285,6 +287,7 @@ before_build:
          $env:LIB     = $env:POSTGRES64 + "\lib;" + $env:LIB
          $env:PATH    = $env:POSTGRES64 + "\bin;" + $env:PATH
      }
+# -------------------------------------------------------------------------------------------

 after_build:
  - ps: |
@@ -413,7 +416,7 @@ test_script:
          if ($env:platform -eq "Win32")
          {
            $env:PATH = "$env:POCO_BASE\bin;" + $env:PATH;$suffix = '';
-            $excluded   = @('Data', 'Data/ODBC', 'Data/MySQL', 'Redis', 'PDF')
+            $excluded   = @('Data', 'Data/ODBC', 'Redis', 'PDF')
          }
          if ($env:platform -eq "x64")
          {
--- a/build/config/Cygwin
+++ b/build/config/Cygwin
@@ -12,6 +12,8 @@
 #
 LINKMODE ?= SHARED

+OMIT    = Data/PostgreSQL
+
 #
 # Define Tools
 #
--- a/4
+++ b/4
@@ -9,8 +9,9 @@ Crypto
 NetSSL_OpenSSL
 NetSSL_Win
 Data
-Data/SQLite
 Data/ODBC
+Data/SQLite
+Data/MySQL
 Data/PostgreSQL
 Zip
 PageCompiler
@@ -21,4 +22,3 @@ MongoDB
 Redis
 PocoDoc
 ProGen
-Data/MySQL
--- a/release/script/mkrelease
+++ b/release/script/mkrelease
@@ -293,7 +293,7 @@ cppunit:
 	$(MAKE) -C $(POCO_BASE)/CppUnit 

 CppUnit-clean:
-	$(MAKE) -C \$(POCO_BASE)/CppUnit clean
+	$(MAKE) -C $(POCO_BASE)/CppUnit clean

 install: libexecs
 	mkdir -p $(INSTALLDIR)/include/Poco
--- a/travis/OSX/excluded.sh
+++ b/travis/OSX/excluded.sh
@@ -3,5 +3,5 @@
 # should be restored later on when the OSX environment would have
 # been fixed by Travis
 #
-export EXCLUDE_TESTS="Data/MySQL Data/ODBC MongoDB Redis PDF"
+export EXCLUDE_TESTS="Data/ODBC Data/MySQL Data/PostgreSQL MongoDB Redis PDF"