Date: Sun, 9 Aug 2015 16:33:32 +0000 (UTC) From: Michael Gmelin <grembo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393806 - in head/devel/cdash: . files Message-ID: <201508091633.t79GXWuw019532@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grembo Date: Sun Aug 9 16:33:31 2015 New Revision: 393806 URL: https://svnweb.freebsd.org/changeset/ports/393806 Log: Use dos2unix, so patches apply cleanly after commit. Differential Revision: https://reviews.freebsd.org/D3310 Approved by: mentors (implicit) Modified: head/devel/cdash/Makefile head/devel/cdash/files/patch-CMakeLists.txt Modified: head/devel/cdash/Makefile ============================================================================== --- head/devel/cdash/Makefile Sun Aug 9 16:31:01 2015 (r393805) +++ head/devel/cdash/Makefile Sun Aug 9 16:33:31 2015 (r393806) @@ -16,7 +16,9 @@ OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL PGSQL OPTIONS_DEFAULT=MYSQL -USES= cmake:outsource zip +USES= dos2unix cmake:outsource zip +DOS2UNIX_GLOB= *.php *.xml *.xsl *.txt + CMAKE_ARGS+= -DCDASH_DB_NAME:STRING=cdash \ -DCDASH_DB_LOGIN:STRING=cdash \ -DCDASH_DB_TYPE:STRING=${DB_TYPE} Modified: head/devel/cdash/files/patch-CMakeLists.txt ============================================================================== --- head/devel/cdash/files/patch-CMakeLists.txt Sun Aug 9 16:31:01 2015 (r393805) +++ head/devel/cdash/files/patch-CMakeLists.txt Sun Aug 9 16:33:31 2015 (r393806) @@ -1,19 +1,19 @@ --- CMakeLists.txt.orig 2012-03-02 11:38:07.000000000 +0100 +++ CMakeLists.txt 2012-03-02 11:38:47.000000000 +0100 @@ -11,6 +11,7 @@ - set(CDASH_DB_PORT "" CACHE STRING "Port to connect to the database") - set(CDASH_DB_HOST "localhost" CACHE STRING "Hostname of the database server") - set(CDASH_DB_TYPE "mysql" CACHE STRING "Database type") -+set(CDASH_DB_NAME "cdash4simpletest" CACHE STRING "Database name") - option(CDASH_USE_SELENIUM "Should CDash use Selenium to test ajax functionality?" OFF) - option(CDASH_PRO "Are we testing CDashPro?" OFF) - set(CMake_SOURCE_DIR CACHE FILEPATH "Path to CMake source dir. Set this to import tests from CMake") + set(CDASH_DB_PORT "" CACHE STRING "Port to connect to the database") + set(CDASH_DB_HOST "localhost" CACHE STRING "Hostname of the database server") + set(CDASH_DB_TYPE "mysql" CACHE STRING "Database type") ++set(CDASH_DB_NAME "cdash4simpletest" CACHE STRING "Database name") + option(CDASH_USE_SELENIUM "Should CDash use Selenium to test ajax functionality?" OFF) + option(CDASH_PRO "Are we testing CDashPro?" OFF) + set(CMake_SOURCE_DIR CACHE FILEPATH "Path to CMake source dir. Set this to import tests from CMake") @@ -87,7 +88,7 @@ - // - // Some of the CDash tests also inject config settings below as tests run... - // --$CDASH_DB_NAME = 'cdash4simpletest'; -+$CDASH_DB_NAME = '${CDASH_DB_NAME}'; - $CDASH_TESTING_MODE = true; - $CDASH_REGISTRATION_EMAIL_VERIFY = false; - $CDASH_TESTING_RENAME_LOGS = ${rename_logs}; + // + // Some of the CDash tests also inject config settings below as tests run... + // +-$CDASH_DB_NAME = 'cdash4simpletest'; ++$CDASH_DB_NAME = '${CDASH_DB_NAME}'; + $CDASH_TESTING_MODE = true; + $CDASH_REGISTRATION_EMAIL_VERIFY = false; + $CDASH_TESTING_RENAME_LOGS = ${rename_logs};
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508091633.t79GXWuw019532>