Merge branch 'windows-command-line-release-mode'

Author: dannyedel

.appveyor.yml

@@ -23,7 +23,7 @@ before_build:
         cmake ..
         -G "Visual Studio 12 2013"
         -DUseQtFive=ON
-        -DDownloadTestPDF=ON
+        -DUsePrerenderedPDF=ON
         -DBoostStaticLink=ON
         -DWindowsStaticLink=OFF
         -DRunDualScreenTests=OFF
@@ -49,8 +49,12 @@ before_test:
     - cmd: SET PATH=%PATH%;C:\dspdf\popplerDyn\poppler\bin
     - cmd: SET PATH=%PATH%;C:\qt\5.5\msvc2013\bin
     - cmd: if exist Testing\Debug copy C:\dspdf\popplerDyn\poppler\bin\poppler-qt5d.dll Testing\Debug\poppler-qt5.dll
-    - cmd: if exist Testing\Debug copy C:\dspdf\popplerDyn\poppler\bin\poppler-qt5d.dll Testing\poppler-qt5.dll
+    - cmd: if exist Testing\Debug copy C:\dspdf\popplerDyn\poppler\bin\poppler-qt5d.dll Debug\poppler-qt5.dll
+    - cmd: if exist Testing\Debug windeployqt Testing\Debug\
+    - cmd: if exist Testing\Debug windeployqt Debug\
     - cmd: SET CTEST_OUTPUT_ON_FAILURE=1
+    - cmd: if exist Testing\Release windeployqt Testing\Release\
+    - cmd: if exist Testing\Release windeployqt Release\
 
 after_test:
     - cmd: msbuild RUN_TESTS.vcxproj

CHANGELOG.md

@@ -19,6 +19,9 @@ Changes in behaviour:
     environment does not have that pass -DRunDualScreenTests=OFF at
     CMake time.  This can be useful if you run the test suite under
     XvFB.
+  * Instead of offering pre-rendered PDFs for download, they are now
+    included in the source tree.  The option `DownloadTestPDF` has
+    been replaced with `UsePrerenderedPDF` accordingly.
 
 New features:
 * Memory usage now configurable

CMakeLists.txt

@@ -38,7 +38,7 @@ option(BuildTests "Build unit tests (this requires pdflatex or internet access a
 option(RunDualScreenTests "Also run tests that require two screens to be connected" ON)
 option(BoostStaticLink "Link statically against the boost libraries" OFF)
 option(WindowsStaticLink "Windows/MSVC only: Link statically against the dependencies and set /MT instead of /MD" ON)
-option(DownloadTestPDF "Download test PDFs from http://danny-edel.de, rather then building them using latex-beamer" OFF)
+option(UsePrerenderedPDF "Use prerendered PDFs included in the source for testing, instead of building with pdflatex" OFF)
 option(CodeCoverage "Add coverage analysis code to the program. Will slow it down. A lot. Only supported on GCC right now." OFF)
 
 include(cmake/platforms.cmake)

_travis/configure

@@ -13,9 +13,9 @@ CMAKE_PARAMETERS+=" -DCMAKE_BUILD_TYPE=Debug"
 
 # OSX specific stuff
 if [ "$TRAVIS_OS_NAME" = "osx" ] ; then
-	# Download Test PDF,
+	# Use prerendered PDF
 	# rather than install pdflatex
-	CMAKE_PARAMETERS+=" -DDownloadTestPDF=ON"
+	CMAKE_PARAMETERS+=" -DUsePrerenderedPDF=ON"
 
 	# Skip dual screen tests since we don't have
 	# xvfb-run

main.cpp

@@ -29,21 +29,17 @@
 #include <QTranslator>
 #include <QLibraryInfo>
 
-#if defined ( _WIN32 ) && defined ( NDEBUG )
-#pragma comment(linker, "/SUBSYSTEM:windows")
-#include <Windows.h>
+#if defined ( _WIN32 )
+	#pragma comment(linker, "/ENTRY:mainCRTStartup")
 
-int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
-{
-	int argc = __argc;
-	#define argv __argv
+	#if defined( NDEBUG )
+		#pragma comment(linker, "/SUBSYSTEM:windows")
+	#endif
 
-#else
+#endif
 
 int main(int argc, char** argv)
 {
-
-#endif
 	QApplication app(argc, argv);
 
 	app.setApplicationName( QString::fromUtf8("dspdfviewer") );

testing/.gitignore

@@ -3,6 +3,5 @@
 *.log
 *.nav
 *.out
-*.pdf
 *.snm
 *.toc

testing/CMakeLists.txt

@@ -15,21 +15,20 @@ list(APPEND PDFFILENAMES
 )
 
 if(DownloadTestPDF)
-	file(DOWNLOAD http://danny-edel.de/colored-rectangles.pdf ${CMAKE_CURRENT_BINARY_DIR}/colored-rectangles.pdf
-		TIMEOUT 30
-		SHOW_PROGRESS
-		EXPECTED_MD5 de9617fb1c00d6185e90314124e2c2f5
-		)
-	file(DOWNLOAD http://danny-edel.de/images.pdf ${CMAKE_CURRENT_BINARY_DIR}/images.pdf
-		TIMEOUT 30
-		SHOW_PROGESS
-		EXPECTED_MD5 5c72e0954d457e3e9a1287ff299e307a
-		)
-	file(DOWNLOAD http://danny-edel.de/many-many-pages.pdf ${CMAKE_CURRENT_BINARY_DIR}/many-many-pages.pdf
-		TIMEOUT 30
-		SHOW_PROGRESS
-		EXPECTED_MD5 22d934fbc13a93adc5e91bfec866229e
-		)
+	message(WARNING "DownloadTestPDF option has been deprectated, since "
+		"prerendered PDFs are now included in the source.  Use the option
+		-DUsePrerenderedPDF=ON from now on.")
+	set(UsePrerenderedPDF ON)
+endif()
+
+if(UsePrerenderedPDF)
+	foreach(pdffile IN LISTS PDFFILENAMES)
+		file(
+			COPY "pdfs/${pdffile}"
+			DESTINATION .
+			)
+		message(STATUS "Using pre-rendered ${pdffile}")
+	endforeach()
 else()
 	# Compile from source
 	find_program(PDFLATEX