dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected issue with windows builds where the correct configuration 

and filesystem would be used.

closes #852
closes #854
This commit is contained in:
Ross McDonald 2016-03-15 08:11:55 -05:00 committed by Cameron Sparr
parent 2cb32a683e
commit 675b6dc305
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/build.py
View File

@ -468,19 +468,28 @@ def build_packages(build_output, version, nightly=False, rc=None, iteration=1):
arch, arch,
'{}-{}-{}'.format(PACKAGE_NAME, version, iteration)) '{}-{}-{}'.format(PACKAGE_NAME, version, iteration))
create_dir(build_root) create_dir(build_root)
create_package_fs(build_root)
# Copy packaging scripts to build directory # Copy packaging scripts to build directory
package_scripts(build_root) if platform == 'windows':
package_scripts(build_root, windows=True)
else:
create_package_fs(build_root)
package_scripts(build_root)
for binary in targets: for binary in targets:
# Copy newly-built binaries to packaging directory
if platform == 'windows': if platform == 'windows':
# For windows, we just want to copy the binary into the root directory
binary = binary + '.exe' binary = binary + '.exe'
# Where the binary currently is located # Where the binary should go in the package filesystem
fr = os.path.join(current_location, binary) to = os.path.join(build_root, binary)
# Where the binary should go in the package filesystem # Where the binary currently is located
to = os.path.join(build_root, INSTALL_ROOT_DIR[1:], binary) fr = os.path.join(current_location, binary)
else:
# Where the binary currently is located
fr = os.path.join(current_location, binary)
# Where the binary should go in the package filesystem
to = os.path.join(build_root, INSTALL_ROOT_DIR[1:], binary)
if debug: if debug:
print("[{}][{}] - Moving from '{}' to '{}'".format(platform, print("[{}][{}] - Moving from '{}' to '{}'".format(platform,
arch, arch,
@ -566,6 +575,7 @@ def build_packages(build_output, version, nightly=False, rc=None, iteration=1):
return outfiles return outfiles
finally: finally:
# Cleanup # Cleanup
print("Cleaning up build dir: {}".format(tmp_build_dir))
shutil.rmtree(tmp_build_dir) shutil.rmtree(tmp_build_dir)
def print_usage(): def print_usage():