Merge pull request #314 from kainjow/travis-osx-package

Add travis build for making the OS X package

.travis.yml

@@ -2410,6 +2410,8 @@ env:
 #      ENABLE_WEBSOCKETS=YES
 #      ENABLE_LUA=YES
 #      ENABLE_DUKTAPE=YES
+    # Make a separate matrix build that only makes the OS X package
+    - MACOSX_PACKAGE=1
 
 addons:
   apt:
@@ -2474,9 +2476,17 @@ matrix:
     # Exclude GCC from OS X builds because it's actually clang so it's just duplicate builds
     - os: osx
       compiler: gcc
+    # Exclude Linux from MACOSX_PACKAGE builds
+    - os: linux
+      env: MACOSX_PACKAGE=1
 
 script:
-  - CTEST_OUTPUT_ON_FAILURE=1 make all test
+  - if [ "${MACOSX_PACKAGE}" == "1" ]; then
+      cd "${TRAVIS_BUILD_DIR}";
+      make -f Makefile.osx package;
+    else
+      CTEST_OUTPUT_ON_FAILURE=1 make all test;
+    fi
 
 # Coveralls options: https://github.com/eddyxu/cpp-coveralls/blob/master/README.md
 after_success:

Makefile.osx

@@ -22,6 +22,7 @@ RESOURCES_DIR = $(CONTENTS_DIR)/Resources
 OSXBIN_DIR = $(CONTENTS_DIR)/MacOS
 
 CIVETWEB_VERSION = $(shell perl -lne '/define\s+CIVETWEB_VERSION\s+"(\S+)"/ and print $$1' include/civetweb.h)
+ZIPFILENAME = $(PACKAGE)-$(CIVETWEB_VERSION).zip
 
 include Makefile
 
@@ -35,8 +36,7 @@ package: build
 	install -m 755 $(CPROG) $(OSXBIN_DIR)/$(PACKAGE)
 	install -m 644 docs/Installing.md $(DMG_DIR)/Installing.txt
 	install -m 644 LICENSE.md $(DMG_DIR)/License.txt
-	ln -fs /Applications $(DMG_DIR)/
-	hdiutil create $(PACKAGE)-$(CIVETWEB_VERSION).dmg -volname "$(PACKAGE) $(CIVETWEB_VERSION)" -srcfolder $(DMG_DIR) -ov
-#	@rm -rf $(DMG_DIR)
+	rm -rf $(ZIPFILENAME)
+	cd $(DMG_DIR) && zip -r ../../$(ZIPFILENAME) .
 
 .PHONY: package