WIP: osx-pkg

luvit · Aug 15, 2012 · e9e44c8 · e9e44c8
1 parent 6380368
commit e9e44c8
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -295,5 +295,40 @@ tarball: dist_build
 	tar -czf ${DIST_FILE} -C ${DIST_DIR}/${VERSION} ${DIST_NAME}
 	rm -rf ${DIST_FOLDER}
 
-.PHONY: test install uninstall all api.markdown bundle tarball
+#####
+# OSX
+PKG=out/$(DIST_NAME).pkg
+packagemaker=/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
+PKGDIR=dist-osx
+
+osx-pkg: $(PKG)
+
+PKG_BUILDTYPE=Debug
+PKG_ENV=BUILDTYPE=$(PKG_BUILDTYPE)
+
+$(PKG):
+	rm -rf $(PKGDIR)
+	rm -rf out/deps out/$(PKG_BUILDTYPE)
+	rm -rf out/
+	$(PKG_ENV) ./configure --prefix=$(PKGDIR)/usr/local --arch=x64
+	$(PKG_ENV) $(MAKE) -C out
+	$(PKG_ENV) $(MAKE) -C out install
+	rm -rf out/
+	$(PKG_ENV) ./configure --prefix=$(PKGDIR)/32/usr/local --arch=ia32
+	$(PKG_ENV) $(MAKE) -C out
+	$(PKG_ENV) $(MAKE) -C out install
+	#SIGN="$(SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
+	lipo $(PKGDIR)/32/usr/local/bin/luvit \
+		$(PKGDIR)/usr/local/bin/luvit \
+		-output $(PKGDIR)/usr/local/bin/luvit-universal \
+		-create
+	mv $(PKGDIR)/usr/local/bin/luvit-universal $(PKGDIR)/usr/local/bin/luvit
+	rm -rf $(PKGDIR)/32
+	$(packagemaker) \
+		--id "io.luvit.luvit" \
+		--doc tools/luvit.pmdoc \
+		--out $(PKG)
+	#SIGN="$(SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh
+
+.PHONY: test install uninstall all api.markdown bundle tarball osx-pkg
 
diff --git a/README.markdown b/README.markdown
@@ -115,3 +115,7 @@ Supports the following commands:
 * bt
 
 The debugger will execute any arbitrary Lua statement by default.
+
+### Building OSX Packages
+
+Install PackageMaker by installing the 
diff --git a/common.gypi b/common.gypi
@@ -133,12 +133,6 @@
         ],
       }],
       ['OS=="mac"', {
-        'ldflags': [ '-pthread', '-Wl,-E' ],
-        'defines': [
-          'DARWIN',
-          'DARWIN_10',
-          '_REENTRANT',
-        ],
         'xcode_settings': {
           'ALWAYS_SEARCH_USER_PATHS': 'NO',
           'GCC_CW_ASM_SYNTAX': 'NO',                # No -fasm-blocks
@@ -147,14 +141,13 @@
           'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',        # -fno-exceptions
           'GCC_ENABLE_CPP_RTTI': 'NO',              # -fno-rtti
           'GCC_ENABLE_PASCAL_STRINGS': 'NO',        # No -mpascal-strings
-          # GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden
-          'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
-          'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
           'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics
           'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
+          'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
+          'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
           'MACOSX_DEPLOYMENT_TARGET': '10.6',       # -mmacosx-version-min=10.6
-          'PREBINDING': 'NO',                       # No -Wl,-prebind
           'USE_HEADERMAP': 'NO',
+          'PREBINDING': 'NO',                       # No -Wl,-prebind
           'OTHER_CFLAGS': [
             '-fno-strict-aliasing',
           ],
@@ -170,6 +163,14 @@
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
           }],
         ],
+        'conditions': [
+          ['target_arch=="ia32"', {
+            'xcode_settings': {'ARCHS': ['i386']},
+          }],
+          ['target_arch=="x64"', {
+            'xcode_settings': {'ARCHS': ['x86_64']},
+          }],
+        ],
       }],
     ],
   }

diff --git a/configure b/configure
@@ -74,9 +74,6 @@ def host_arch():
   if sys.platform == "win32":
       return 'ia32'
 
-  if sys.platform == "darwin":
-      return 'ia32'
-
   arch = uname('-p')
 
   if arch == 'unknown':

diff --git a/deps/luajit.gyp b/deps/luajit.gyp
@@ -51,6 +51,11 @@
         'cflags': ['-pthread'],
         'ldflags': ['-pthread'],
       }],
+      ['OS=="mac"', {
+        'defines': [
+          'LUAJIT_OS=LUAJIT_OS_OSX',
+        ],
+      }],
       ],
     },