Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
  • 4 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 05, 2012
@cvgs cvgs PackageMaker Filters extended for cvs, svn, git
Put PackageMaker Content Filter into separate variable to allow for
cleaner overrides (instead of having to change PM_EXTRA_ARGS).
@cvgs cvgs Added explicit pseudo payload stanza
The pseudo_payload can be overridden in your Makefile to get "cleaner"
@cvgs cvgs Changed PM_FILTER
forgot to exclude ._.DS_Store files (in addition to .DS_Store).
Commits on Mar 06, 2012
@unixorn Merge pull request #32 from cvgs/master
Better filtering defaults, explicit pseudo_payload
Showing with 7 additions and 2 deletions.
  1. +7 −2 luggage.make
9 luggage.make
@@ -73,6 +73,7 @@ PAYLOAD_D=${SCRATCH_D}/payload
# package's Makefile.
PM_EXTRA_ARGS=--verbose --no-recommend --no-relocate
+M_FILTER=--filter "/CVS$$" --filter "/\.svn$$" --filter "/\.cvsignore$$" --filter "/\.cvspass$$" --filter "/(\._)?\.DS_Store$$" --filter "/\.git$$" --filter "/\.gitignore$$"
# Set to false if you want your package to install to volumes other than the boot volume
@@ -146,7 +147,11 @@ package_root:
# packagemaker chokes if the pkg doesn't contain any payload, making script-only
# packages fail to build mysteriously if you don't remember to include something
# in it, so we're including the /usr/local directory, since it's harmless.
-scriptdir: l_usr_local
+# this pseudo_payload can easily be overridden in your makefile
+pseudo_payload: l_usr_local
+scriptdir: pseudo_payload
@sudo mkdir -p ${SCRIPT_D}
@@ -207,7 +212,7 @@ compile_package: payload .luggage.pkg.plist modify_packageroot
@echo "Creating ${PAYLOAD_D}/${PACKAGE_FILE}"
sudo ${PACKAGEMAKER} --root ${WORK_D} \
--id ${PACKAGE_ID} \
- --filter DS_Store \
+ ${PM_FILTER} \
--target ${PACKAGE_TARGET_OS} \
--title ${TITLE} \
--info ${SCRATCH_D}/luggage.pkg.plist \

No commit comments for this range

Something went wrong with that request. Please try again.