valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 01:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

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

0
package/osx/README.md → package/darwin/README.md
View File

0
package/osx/osquery.pkgproj → package/darwin/osquery.pkgproj
View File

0
package/osx/osquery_post_install.sh → package/darwin/osquery_post_install.sh
View File

4
tools/genpackage.py
View File

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