Changes for Mac OS X build. Various fixes

- moved resources to separate directory resources/
- added empty line at the end of files
- separate entry point (subprocess.cpp) for OS X

Author: spajak

.gitignore

@@ -1,2 +1,3 @@
 build/
 cef/
+.DS_Store

CHANGELOG.md

@@ -1,36 +1,33 @@
 Changelog
 ===
 ### 0.2.1 (2016-12-20)
-* Allow only specified schemes when in server mode (ie. block file:// access)
-* Added option to enable JavaScript --javascript
-* Added --file option to load file from command line
-* Disabled standard input (use --file instead)
-* Added --background option to print html backgrounds
-* Bulding with CEF 3.2883.1540.gedbfb20 / Chromium 55.0.2883.59 version (Windows & Linux, 64bit)
+* Bulding with CEF 3.2883.1540.gedbfb20 / Chromium 55.0.2883.59 (Windows & Linux, 64bit)
+* Allow only specified schemes when in server mode (ie. block `file://` access)
+* Added option to enable JavaScript `--javascript`
+* Added `--file` option to load file from command line
+* Disabled standard input (use `--file` instead)
+* Added `--background` option to print html backgrounds
 
-===
 ### 0.2.0 (2016-11-29)
-* Added HTTP server mode (use with --server flag)
-* Added configurable --host and --port when running in server mode
+* Bulding with CEF 3.2883.1539.gd7f087e / Chromium 55.0.2883.59 (Windows & Linux, 64bit)
+* Added HTTP server mode (use with `--server` flag)
+* Added configurable `--host` and `--port` options when running in server mode
 * Various fixes and improvements
-* Bulding with CEF 3.2883.1539.gd7f087e / Chromium 55.0.2883.59 version (Windows & Linux, 64bit)
 
-===
 ### 0.1.6 (2016-09-21)
-* Fix: small improvements to allow building on Linux (tested on Debian 8.5.0 x64)
 * Small changes to build using CEF 3.2743.1449.g90ba67d build
+* Small improvements to allow building on Linux (tested on Debian 8.5.0 x64)
 
-===
 ### 0.1.5 (2016-09-15)
-* Add: option to set page margin --margin
-* Add: option to list available page sizes --list-sizes
-* Change: url is now specified with --url option
+* Added option to set page margin `--margin`
+* Added option to list available page sizes `--list-sizes`
+* Changed url to be specified with `--url` option
 * Heavy code refractoring
 
 ### 0.1.1 (2016-08-06)
-* Add: some paper sizes: US, ANSI and photo
-* Add: help message
-* Fix: url load error handling
+* Added some more paper sizes: US, ANSI and photo
+* Added help message
+* Fixed url load error handling
 
 ### 0.1.0 (2016-08-03)
 * Initial release. Working version :)

CMakeLists.txt

@@ -113,6 +113,10 @@
 
 cmake_minimum_required(VERSION 2.8.12.1)
 
+if(APPLE)
+    set(PROJECT_ARCH x86_64)
+endif()
+
 # Only generate Debug and Release configuration types.
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
 

README.md

@@ -44,12 +44,7 @@ In addition to POSTing content inside the request body, special HTTP header `Con
 
 ### Building
 
-In order to build, [CEF build distribution files](http://opensource.spotify.com/cefbuilds/index.html) must be placed in cef/ subdirectory. `cef-pdf` should compile without problems with cmake/ninja on Windows 7+ and Linux (tested on Debian 8.5.0 x64), using decent C++11 compiler. Mac OS X needs some work (contributors welcome).
-
-### TODO
-
- - Mac OS X versions
- - Improve performance
+In order to build, [CEF build distribution files](http://opensource.spotify.com/cefbuilds/index.html) must be placed in cef/ subdirectory. `cef-pdf` should compile without problems with cmake/ninja on Windows (7, x64), Linux (tested on Debian 8.5.0, x64) and Mac OS X (10.11.6) using decent C++11 compiler.
 
 ### License
 

resource/Info.plist

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.cef.cef-pdf.helper</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.9.0</string>
+	<key>LSUIElement</key>
+	<string>1</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>© 2017, cef-pdf</string>
+</dict>
+</plist>

src/cef-pdf.exe.manifest resource/cef-pdf.exe.manifest

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.cef.cefsimple.helper</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSFileQuarantineEnabled</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.9.0</string>
+	<key>LSUIElement</key>
+	<string>1</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>© 2017, cef-pdf</string>
+</dict>
+</plist>

src/compatibility.manifest resource/compatibility.manifest

@@ -3,23 +3,24 @@
 # can be found in the LICENSE file.
 
 #
-# Source files.
+# Targets and source files.
 #
 
-# cef-pdf sources.
+set(CEF_TARGET "cef-pdf")
+set(CEF_HELPER_TARGET "cef-pdf Helper")
+
 file(GLOB_RECURSE CEFPDF_SRCS "*.cpp")
-source_group(cef-pdf FILES ${CEFPDF_SRCS})
+set(CEFPDF_HELPER_SRCS ${CEFPDF_SRCS})
+list(FILTER CEFPDF_SRCS EXCLUDE REGEX "subprocess\\.cpp$")
+list(FILTER CEFPDF_HELPER_SRCS EXCLUDE REGEX "main\\.cpp$")
+
+source_group("${CEF_TARGET}" FILES ${CEFPDF_SRCS})
+#source_group("${CEF_HELPER_TARGET}" FILES ${CEFPDF_HELPER_SRCS})
 
 #
 # Shared configuration.
 #
 
-# Target executable names.
-set(CEF_TARGET "cef-pdf")
-if(OS_MACOSX)
-  set(CEF_HELPER_TARGET "cef-pdf Helper")
-endif()
-
 # Logical target used to link the libcef library.
 ADD_LOGICAL_TARGET("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}")
 
@@ -71,8 +72,9 @@ if(OS_MACOSX)
   add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper)
   target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
   set_target_properties(${CEF_HELPER_TARGET} PROPERTIES
-    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/helper-Info.plist
-    )
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/resource/helper-Info.plist
+  )
+  target_compile_options(${CEF_HELPER_TARGET} PUBLIC -fexceptions -Wno-unused-local-typedef)
 
   # Fix the framework rpath in the helper executable.
   FIX_MACOSX_HELPER_FRAMEWORK_RPATH(${CEF_HELPER_TARGET})
@@ -84,8 +86,9 @@ if(OS_MACOSX)
   target_link_libraries(${CEF_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
   set_target_properties(${CEF_TARGET} PROPERTIES
     RESOURCE "${CEFPDF_RESOURCES_SRCS}"
-    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/Info.plist
-    )
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/resource/Info.plist
+  )
+  target_compile_options(${CEF_TARGET} PUBLIC -fexceptions -Wno-unused-local-typedef)
 
   # Copy files into the main app bundle.
   add_custom_command(
@@ -95,12 +98,15 @@ if(OS_MACOSX)
     COMMAND ${CMAKE_COMMAND} -E copy_directory
             "${CEF_HELPER_APP}"
             "${CEF_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app"
+    # Remove helper bundle
+    COMMAND ${CMAKE_COMMAND} -E remove_directory
+            "${CEF_HELPER_APP}"
     # Copy the CEF framework into the Frameworks directory.
     COMMAND ${CMAKE_COMMAND} -E copy_directory
             "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework"
             "${CEF_APP}/Contents/Frameworks/Chromium Embedded Framework.framework"
     VERBATIM
-    )
+  )
 
   # Fix the framework rpath in the main executable.
   FIX_MACOSX_MAIN_FRAMEWORK_RPATH(${CEF_TARGET})
@@ -146,7 +152,7 @@ if(OS_WINDOWS)
   endif()
 
   # Add the custom manifest files to the executable.
-  ADD_WINDOWS_MANIFEST("${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_TARGET}" "exe")
+  ADD_WINDOWS_MANIFEST("${CMAKE_SOURCE_DIR}/resource" "${CEF_TARGET}" "exe")
 
   # Copy binary and resource files to the target output directory.
   COPY_FILES("${CEF_TARGET}" "${CEF_BINARY_FILES}" "${CEF_BINARY_DIR}" "${CEF_TARGET_OUT_DIR}")

resource/helper-Info.plist

@@ -322,4 +322,4 @@ bool deleteTempFile(const std::string& path)
     return 0 == std::remove(path.c_str());
 }
 
-} // namespace cefpdf
+} // namespace cefpdf

src/CMakeLists.txt

@@ -45,4 +45,4 @@ class ContentProvider : public Visitor
 } // namespace job
 } // namespace cefpdf
 
-#endif // JOB_CONTENT_PROVIDER_H_
+#endif // JOB_CONTENT_PROVIDER_H_

src/Common.cpp

@@ -41,4 +41,4 @@ class Loader : public Visitor
 } // namespace job
 } // namespace cefpdf
 
-#endif // JOB_LOADER_H_
+#endif // JOB_LOADER_H_

src/Job/ContentProvider.h

@@ -34,4 +34,4 @@ class Local : public Job
 } // namespace job
 } // namespace cefpdf
 
-#endif // JOB_LOCAL_H_
+#endif // JOB_LOCAL_H_

src/Job/Loader.h

@@ -49,8 +49,6 @@ class Manager : public CefBaseRefCounted
 
     void Resolve(Manager::Iterator it, const std::string&);
 
-    unsigned int m_counter = 0;
-
     // Include the default reference counting implementation.
     IMPLEMENT_REFCOUNTING(Manager)
 };

src/Job/Local.h

@@ -55,4 +55,4 @@ class Printer : public Visitor,
 } // namespace job
 } // namespace cefpdf
 
-#endif // JOB_PRINTER_H_
+#endif // JOB_PRINTER_H_

src/Job/Manager.h

@@ -31,4 +31,4 @@ class Remote : public Job
 } // namespace job
 } // namespace cefpdf
 
-#endif // JOB_REMOTE_H_
+#endif // JOB_REMOTE_H_

src/Job/Printer.h

@@ -22,4 +22,4 @@ class StdInput : public Job
 } // namespace job
 } // namespace cefpdf
 
-#endif // JOB_STDINPUT_H_
+#endif // JOB_STDINPUT_H_

src/Job/Remote.h

@@ -39,4 +39,4 @@ int StdInputStreamReader::Seek(int64 offset, int whence)
 }
 
 } // namespace job
-} // namespace cefpdf
+} // namespace cefpdf

src/Job/StdInput.h

@@ -45,4 +45,4 @@ class StdInputStreamReader : public CefReadHandler
 } // namespace job
 } // namespace cefpdf
 
-#endif // JOB_STDINPUT_STREAM_READER_H_
+#endif // JOB_STDINPUT_STREAM_READER_H_

src/Job/StdInputStreamReader.cpp

@@ -28,4 +28,4 @@ class Visitor : public CefBaseRefCounted
 } // namespace job
 } // namespace cefpdf
 
-#endif // JOB_VISITOR_H_
+#endif // JOB_VISITOR_H_

src/Job/StdInputStreamReader.h

@@ -50,4 +50,4 @@ void PrintHandler::OnPrintStart(CefRefPtr<CefBrowser> browser)
 
 }
 
-} // namespace cefpdf
+} // namespace cefpdf

src/Job/Visitor.h

@@ -24,4 +24,4 @@ void RenderHandler::OnPaint(
 
 }
 
-} // namespace cefpdf
+} // namespace cefpdf

src/PrintHandler.cpp

@@ -34,4 +34,4 @@ bool RequestHandler::OnBeforeBrowse(
     return !std::regex_search(url, re, std::regex_constants::match_continuous);
 }
 
-} // namespace cefpdf
+} // namespace cefpdf

src/RenderHandler.cpp

@@ -74,4 +74,4 @@ class Connection : public CefBaseRefCounted
 } // namespace server
 } // namespace cefpdf
 
-#endif // SERVER_CONNECTION_H_
+#endif // SERVER_CONNECTION_H_

src/RequestHandler.cpp

@@ -34,4 +34,4 @@ struct Response {
 } // namespace server
 } // namespace cefpdf
 
-#endif // SERVER_HTTP_H_
+#endif // SERVER_HTTP_H_

src/Server/Connection.h

@@ -34,4 +34,4 @@ class RequestHandler : public CefBaseRefCounted
 } // namespace server
 } // namespace cefpdf
 
-#endif // SERVER_REQUEST_HANDLER_H_
+#endif // SERVER_REQUEST_HANDLER_H_

src/Server/Http.h

@@ -0,0 +1,9 @@
+#include "Client.h"
+
+// This entry point is for Mac OS X only
+int main(int argc, char* argv[])
+{
+    CefRefPtr<cefpdf::Client> app = new cefpdf::Client();
+    CefMainArgs mainArgs(argc, argv);
+    return app->ExecuteSubProcess(mainArgs);
+}