Skip to content

Commit

Permalink
Code review: 188420043: Changes for deployments.
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Dec 20, 2014
1 parent 8bf8dfa commit f55121f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Don't want compiled files being displayed.
# Ignore back-up files.
*~

# Ignore compiled Python files.
*.pyc
*.pyo

# Don't include build related files.
/dependencies/
Expand Down
2 changes: 1 addition & 1 deletion utils/build_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -1920,7 +1920,7 @@ def Clean(self, source_helper):
for filename in filenames:
if not filenames_to_ignore.match(filename):
logging.info(u'Removing: {0:s}'.format(filename))
shutil.rmtree(filename)
os.remove(filename)

def GetOutputFilename(self, source_helper):
"""Retrieves the filename of one of the resulting files.
Expand Down
2 changes: 1 addition & 1 deletion utils/check_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ def CheckPytsk():
if not CheckPythonModule('dateutil.parser', '', ''):
check_result = False

if not CheckPythonModule('dfvfs', '__version__', '20141212'):
if not CheckPythonModule('dfvfs', '__version__', '20141220'):
check_result = False

if not CheckPythonModule('dpkt', '__version__', '1.8'):
Expand Down
8 changes: 3 additions & 5 deletions utils/prep_dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@
EXIT_FAILURE=1;
EXIT_SUCCESS=0;

# TODO: make this script Mac OS X compatible.

# Remove support for hachoir which is GPLv2 and cannot be distributed
# in binary form. Leave the formatter because it does not link in the
# hachoir code.

rm -f plaso/parsers/hachoir*

sed -i -e "/import hachoir/d" plaso/parsers/__init__.py
sed -i"~" -e '/import hachoir/d' plaso/parsers/__init__.py

SED_SCRIPT="
/_slow': \[/ {
Expand All @@ -39,9 +37,9 @@ SED_SCRIPT="
d
}";

sed -i -e "${SED_SCRIPT}" plaso/frontend/presets.py
sed -i"~" -e "${SED_SCRIPT}" plaso/frontend/presets.py

sed -i "/hachoir_/+2d" plaso/utils/check_dependencies.py
sed -i"~" '/hachoir_/,/^$/d' utils/check_dependencies.py

exit ${EXIT_SUCCESS};

0 comments on commit f55121f

Please sign in to comment.