Permalink
Browse files

Add PackageMaker support for building MacOS X installer

  • Loading branch information...
1 parent ea1f384 commit 31bb59012227d52d4870a9d21fd317cb2e65aec7 Vivek Thampi committed Feb 1, 2012
View
1 .gitignore
@@ -11,3 +11,4 @@ emmett/emmett
emmett/.depend
emmett/lexer.ml
emmett/parser.ml
+.DS_Store
View
2 Makefile.in
@@ -2,7 +2,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
srcdir = @srcdir@
-builddir = @builddir@
+builddir = @builddir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
View
3,555 configure
1,899 additions, 1,656 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
24 configure.in
@@ -1,9 +1,26 @@
AC_PREREQ(2.59)
AC_INIT([vprobe-toolkit], [2011], [vprobes@vmware.com])
AC_CONFIG_MACRO_DIR([m4])
-
AC_PROG_INSTALL
+# Check host
+host_os=`uname`
+host_rel=`uname -r`
+
+AC_SUBST(HOST_OS,[$host_os])
+AC_SUBST(HOST_REL,[$host_rel])
+
+if test "x$host_os" = "xDarwin"; then
+ # check Darwin version >= 8.0 (MacOS 10.4)
+ AX_COMPARE_VERSION([$host_rel],[ge],[8.0],[
+ # check if packagemaker is installed
+ pm_path="/Developer/usr/bin"
+ AC_CHECK_PROG([PACKAGEMAKER],packagemaker,
+ [$pm_path/packagemaker],
+ [no],[$pm_path])
+ ],[])
+fi
+
AX_WITH_PYTHON
if test "x$PYTHON" = "x"; then
AC_MSG_ERROR( [Python not found. Use --with-python to specify path to python binary] )
@@ -75,5 +92,8 @@ if test "$OCAMLDEP" = "no"; then
AC_MSG_ERROR([Please install the OCaml dependency generator])
fi
-AC_CONFIG_FILES([Makefile emmett/Makefile])
+
+AC_CONFIG_FILES([Makefile
+ emmett/Makefile
+ installer/macos/Makefile])
AC_OUTPUT
View
34 emmett/Makefile.in
@@ -20,20 +20,20 @@ JAVA = @JAVA@
# List is in order of dependency!
#
SOURCES = \
- memmodel.ml \
- ast.ml \
- globals.ml \
- defaults.ml \
- symtab.ml \
- domain.ml \
- predef.ml \
- type.ml \
- actions.ml \
- lower.ml \
- vp.ml \
- parser.ml \
- lexer.ml \
- main.ml
+ $(srcdir)/memmodel.ml \
+ $(srcdir)/ast.ml \
+ $(srcdir)/globals.ml \
+ $(srcdir)/defaults.ml \
+ $(srcdir)/symtab.ml \
+ $(srcdir)/domain.ml \
+ $(srcdir)/predef.ml \
+ $(srcdir)/type.ml \
+ $(srcdir)/actions.ml \
+ $(srcdir)/lower.ml \
+ $(srcdir)/vp.ml \
+ $(builddir)/parser.ml \
+ $(builddir)/lexer.ml \
+ $(srcdir)/main.ml
TARGETS = emmett
ifneq ($(OCAMLJAVA),)
@@ -87,12 +87,6 @@ clean:
.depend .depend-java *.cmj *.jo \
emmett emmett.jar
-Makefile: Makefile.in ../config.status
- cd .. && ./config.status $@
-
-../config.status: ../configure
- cd .. && ./config.status --recheck
-
ifneq ($(MAKECMDGOALS),clean)
-include .depend
ifneq ($(OCAMLJAVA),)
View
27 installer/macos/Makefile.in
@@ -0,0 +1,27 @@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+builddir = @builddir@
+HOSTOS = @HOST_OS@
+INSTALL = @INSTALL@
+PKGROOT = $(builddir)/pkgroot
+PKGDIR = $(PKGROOT)/vprobe-toolkit
+PKGBIN = $(PKGDIR)/usr/local/bin
+PMDOC = $(srcdir)/vprobe-toolkit.pmdoc
+PKGMAKER = @PACKAGEMAKER@
+
+ifneq ($(HOSTOS),Darwin)
+ $(error "You need a MacOS X (>= 10.4) host to build the package.")
+endif
+
+ifeq ($(PKGMAKER),)
+ $(error "Package Maker application was not found in this system.")
+endif
+
+vprobe-toolkit.pkg:
+ $(INSTALL) -d -o root -g wheel $(PKGBIN)
+ $(INSTALL) -m 0755 -o root -g wheel $(top_srcdir)/bin/vprobe* $(PKGBIN)
+ $(INSTALL) -m 0755 -o root -g wheel $(top_srcdir)/emmett/emmett $(PKGBIN)
+ $(PKGMAKER) --doc $(PMDOC) --out $(builddir)/$@
+
+clean:
+ rm -rf $(PKGROOT) *.pkg *.mpkg
View
1 installer/macos/vprobe-toolkit.pmdoc/01vprobe-contents.xml
@@ -0,0 +1 @@
+<pkg-contents spec="1.12"><f n="vprobe-toolkit" o="root" g="wheel" p="16893" pt="/Users/vmt/vprobe-toolkit/installer/macos/pkgroot/vprobe-toolkit" m="true" t="file"><f n="usr" o="root" g="wheel" p="16877"><f n="local" o="root" g="wheel" p="16877"><f n="bin" o="root" g="staff" p="16893"><f n="emmett" o="root" g="staff" p="33277"><mod>group</mod><mod>mode</mod></f><f n="vprobe" o="root" g="staff" p="33277"><mod>group</mod><mod>mode</mod></f><f n="vprobe-dwarffrob" o="root" g="staff" p="33277"><mod>group</mod><mod>mode</mod></f><f n="vprobe-stackfilt" o="root" g="staff" p="33277"><mod>group</mod><mod>mode</mod></f><f n="vprobe-stacks2dot" o="root" g="staff" p="33277"><mod>group</mod><mod>mode</mod></f><f n="vprobe-stacksresolve" o="root" g="staff" p="33277"><mod>group</mod><mod>mode</mod></f><f n="vprobe-stackvis" o="root" g="staff" p="33277"><mod>group</mod><mod>mode</mod></f><f n="vprobe-tail" o="root" g="staff" p="33277"><mod>group</mod><mod>mode</mod></f><mod>group</mod><mod>mode</mod></f><mod>group</mod><mod>mode</mod></f><mod>group</mod><mod>mode</mod></f><mod>group</mod><mod>mode</mod></f></pkg-contents>
View
1 installer/macos/vprobe-toolkit.pmdoc/01vprobe.xml
@@ -0,0 +1 @@
+<pkgref spec="1.12" uuid="E3D4FA39-5005-4E16-8C85-0C32B54DA94A"><config><identifier>com.vmware.VProbesToolkit.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">pkgroot/vprobe-toolkit</installFrom><installTo>/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installFrom.isRelativeType</mod><mod>installTo</mod><mod>installFrom.path</mod><mod>identifier</mod><mod>parent</mod><mod>includeRoot</mod></config><contents><file-list>01vprobe-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
View
6 installer/macos/vprobe-toolkit.pmdoc/index.xml
@@ -0,0 +1,6 @@
+<pkmkdoc spec="1.12"><properties><title>VProbes Toolkit</title><build>/Users/vmt/vprobe-toolkit/installer/macos/VProbes Toolkit.mpkg</build><organization>com.vmware</organization><userSees ui="both"/><min-target os="2"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="vprobe-toolkit" id="vprobetoolkit" tooltip="Core Toolkit" description="The core toolkit which includes the Emmett compiler, VProbe app (python), and a collection of utility scripts." starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="com.vmware.VProbesToolkit.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
+{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+
+\f0\fs26 \cf0 Hello World}]]></resource></locale></resources><flags/><item type="file">01vprobe.xml</item><mod>properties.title</mod><mod>properties.customizeOption</mod></pkmkdoc>
View
177 m4/ax_compare_version.m4
@@ -0,0 +1,177 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+#
+# DESCRIPTION
+#
+# This macro compares two version strings. Due to the various number of
+# minor-version numbers that can exist, and the fact that string
+# comparisons are not compatible with numeric comparisons, this is not
+# necessarily trivial to do in a autoconf script. This macro makes doing
+# these comparisons easy.
+#
+# The six basic comparisons are available, as well as checking equality
+# limited to a certain number of minor-version levels.
+#
+# The operator OP determines what type of comparison to do, and can be one
+# of:
+#
+# eq - equal (test A == B)
+# ne - not equal (test A != B)
+# le - less than or equal (test A <= B)
+# ge - greater than or equal (test A >= B)
+# lt - less than (test A < B)
+# gt - greater than (test A > B)
+#
+# Additionally, the eq and ne operator can have a number after it to limit
+# the test to that number of minor versions.
+#
+# eq0 - equal up to the length of the shorter version
+# ne0 - not equal up to the length of the shorter version
+# eqN - equal up to N sub-version levels
+# neN - not equal up to N sub-version levels
+#
+# When the condition is true, shell commands ACTION-IF-TRUE are run,
+# otherwise shell commands ACTION-IF-FALSE are run. The environment
+# variable 'ax_compare_version' is always set to either 'true' or 'false'
+# as well.
+#
+# Examples:
+#
+# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
+#
+# would both be true.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
+#
+# would both be false.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
+#
+# would be true because it is only comparing two minor versions.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
+#
+# would be true because it is only comparing the lesser number of minor
+# versions of the two values.
+#
+# Note: The characters that separate the version numbers do not matter. An
+# empty string is the same as version 0. OP is evaluated by autoconf, not
+# configure, so must be a string, not a variable.
+#
+# The author would like to acknowledge Guido Draheim whose advice about
+# the m4_case and m4_ifvaln functions make this macro only include the
+# portions necessary to perform the specific comparison specified by the
+# OP argument in the final configure script.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 11
+
+dnl #########################################################################
+AC_DEFUN([AX_COMPARE_VERSION], [
+ AC_REQUIRE([AC_PROG_AWK])
+
+ # Used to indicate true or false condition
+ ax_compare_version=false
+
+ # Convert the two version strings to be compared into a format that
+ # allows a simple string comparison. The end result is that a version
+ # string of the form 1.12.5-r617 will be converted to the form
+ # 0001001200050617. In other words, each number is zero padded to four
+ # digits, and non digits are removed.
+ AS_VAR_PUSHDEF([A],[ax_compare_version_A])
+ A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ AS_VAR_PUSHDEF([B],[ax_compare_version_B])
+ B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
+ dnl # then the first line is used to determine if the condition is true.
+ dnl # The sed right after the echo is to remove any indented white space.
+ m4_case(m4_tolower($2),
+ [lt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [gt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [le],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],
+ [ge],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],[
+ dnl Split the operator from the subversion count if present.
+ m4_bmatch(m4_substr($2,2),
+ [0],[
+ # A count of zero means use the length of the shorter version.
+ # Determine the number of characters in A and B.
+ ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
+ ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
+
+ # Set A to no more than B's length and B to no more than A's length.
+ A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
+ ],
+ [[0-9]+],[
+ # A count greater than zero means use only that many subversions
+ A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ ],
+ [.+],[
+ AC_WARNING(
+ [illegal OP numeric parameter: $2])
+ ],[])
+
+ # Pad zeros at end of numbers to make same length.
+ ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
+ B="$B`echo $A | sed 's/./0/g'`"
+ A="$ax_compare_version_tmp_A"
+
+ # Check for equality or inequality as necessary.
+ m4_case(m4_tolower(m4_substr($2,0,2)),
+ [eq],[
+ test "x$A" = "x$B" && ax_compare_version=true
+ ],
+ [ne],[
+ test "x$A" != "x$B" && ax_compare_version=true
+ ],[
+ AC_WARNING([illegal OP parameter: $2])
+ ])
+ ])
+
+ AS_VAR_POPDEF([A])dnl
+ AS_VAR_POPDEF([B])dnl
+
+ dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
+ if test "$ax_compare_version" = "true" ; then
+ m4_ifvaln([$4],[$4],[:])dnl
+ m4_ifvaln([$5],[else $5])dnl
+ fi
+]) dnl AX_COMPARE_VERSION

0 comments on commit 31bb590

Please sign in to comment.