Moving packaging infrastructure to packages/darwin instead of packages/osx

This commit is contained in:
mike@arpaia.co 2014-08-20 01:16:56 -07:00
parent c9fb930ee4
commit 9c11fec7ed
5 changed files with 7 additions and 7 deletions

View File

@ -33,7 +33,7 @@ endif
distclean: clean_tables
ifeq ($(OS),Darwin)
rm -rf package/osx/build
rm -rf package/darwin/build
endif
rm -rf build
@ -48,10 +48,10 @@ package: all
git submodule init
git submodule update
ifeq ($(OS),Darwin)
packagesbuild -v package/osx/osquery.pkgproj
mkdir -p build/osx
mv package/osx/build/osquery.pkg build/osx/osquery.pkg
rm -rf package/osx/build
packagesbuild -v package/darwin/osquery.pkgproj
mkdir -p build/darwin
mv package/darwin/build/osquery.pkg build/darwin/osquery.pkg
rm -rf package/darwin/build
endif
pull:

View File

@ -20,7 +20,7 @@ LOG_FORMAT = "%(levelname)s [Line %(lineno)d]: %(message)s"
# the path to the pkgproj file
PKG_CONFIG_PATH = os.path.join(
os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
"package/osx/osquery.pkgproj",
"package/darwin/osquery.pkgproj",
)
def usage():
@ -37,7 +37,7 @@ def main(argc, argv):
plist = plistlib.readPlist(PKG_CONFIG_PATH)
logging.debug("Project version: %s" % (
logging.info("Project version: %s" % (
plist["PROJECT"]["PACKAGE_SETTINGS"]["VERSION"]
))