Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
Zipr Toolchain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Open Source Software
Zipr Toolchain
Commits
5c888333
Commit
5c888333
authored
4 years ago
by
Will Hawkins
Browse files
Options
Downloads
Patches
Plain Diff
Update scons files in the base repo to accommodate Python v3.
parent
a00273c5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!10
Version update
,
!9
Version update
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
SConscript
+2
-2
2 additions, 2 deletions
SConscript
SConstruct
+4
-4
4 additions, 4 deletions
SConstruct
irdb-libs/SConscript
+4
-4
4 additions, 4 deletions
irdb-libs/SConscript
with
10 additions
and
10 deletions
SConscript
+
2
−
2
View file @
5c888333
...
...
@@ -29,7 +29,7 @@ libsmpsa= SConscript("SMPStaticAnalyzer/SConscript")
libirdbdeep
=
SConscript
(
"
irdb-libs/SConscript.deep
"
)
Depends
(
libirdbdeep
,
libsmpsa
)
print
"
Zipr install is
"
+
env
[
'
ZIPR_INSTALL
'
]
print
(
"
Zipr install is
"
+
env
[
'
ZIPR_INSTALL
'
]
)
Export
(
'
env
'
)
...
...
@@ -69,7 +69,7 @@ if env.GetOption('clean') and os.path.isfile("manifest.txt.config"):
# if [[ $(head -1 manifest.txt.config) == $PS_INSTALL ]] ; then
if
str
(
first_line
)
==
str
(
os
.
environ
[
'
PS_INSTALL
'
]):
print
"
Doing pedi clean as I
'
m the pedi root
"
print
(
"
Doing pedi clean as I
'
m the pedi root
"
)
os
.
system
(
"
pwd; $PEDI_HOME/pedi -c -m manifest.txt
"
)
shutil
.
rmtree
(
os
.
environ
[
'
PS_INSTALL
'
])
...
...
This diff is collapsed.
Click to expand it.
SConstruct
+
4
−
4
View file @
5c888333
...
...
@@ -22,13 +22,13 @@ env.Replace(ZIPR_INSTALL=os.environ['ZIPR_INSTALL'])
if
int
(
env
[
'
debug
'
])
==
1
:
print
"
Setting debug mode
"
print
(
"
Setting debug mode
"
)
env
.
Append
(
CFLAGS
=
"
-g
"
)
env
.
Append
(
CXXFLAGS
=
"
-g
"
)
env
.
Append
(
LINKFLAGS
=
"
-g
"
)
env
.
Append
(
SHLINKFLAGS
=
"
-g
"
)
env
.
Append
(
LINKFLAGS
=
"
-g
"
)
env
.
Append
(
SHLINKFLAGS
=
"
-g
"
)
else
:
print
"
Setting release mode
"
print
(
"
Setting release mode
"
)
env
.
Append
(
CFLAGS
=
"
-O
"
)
env
.
Append
(
CXXFLAGS
=
"
-O
"
)
env
.
Append
(
LINKFLAGS
=
"
-O
"
)
...
...
This diff is collapsed.
Click to expand it.
irdb-libs/SConscript
+
4
−
4
View file @
5c888333
...
...
@@ -7,8 +7,8 @@ Import('env')
if
env
.
GetOption
(
'
clean
'
):
if
os
.
path
.
exists
(
os
.
environ
[
'
SECURITY_TRANSFORMS_HOME
'
]
+
"
/include/targ-config.h
"
):
print
'
Removing include/targ-config.h
'
os
.
remove
(
os
.
environ
[
'
SECURITY_TRANSFORMS_HOME
'
]
+
"
/include/targ-config.h
"
)
print
(
'
Removing include/targ-config.h
'
)
os
.
remove
(
os
.
environ
[
'
SECURITY_TRANSFORMS_HOME
'
]
+
"
/include/targ-config.h
"
)
os
.
chdir
(
os
.
environ
[
'
SECURITY_TRANSFORMS_HOME
'
]
+
"
/third_party/capstone
"
)
os
.
system
(
"
make clean
"
)
os
.
chdir
(
os
.
environ
[
'
SECURITY_TRANSFORMS_HOME
'
])
...
...
@@ -20,11 +20,11 @@ if env.GetOption('clean'):
else
:
os
.
chdir
(
os
.
environ
[
'
SECURITY_TRANSFORMS_HOME
'
]
+
"
/third_party/capstone
"
)
print
"
Rebuilding libcapstone.
"
print
(
"
Rebuilding libcapstone.
"
)
jobs
=
env
.
GetOption
(
'
num_jobs
'
)
os
.
system
(
"
make -j
"
+
str
(
jobs
))
os
.
chdir
(
os
.
environ
[
'
SECURITY_TRANSFORMS_HOME
'
]
+
"
/third_party/keystone
"
)
print
"
Rebuilding libkeystone.
"
print
(
"
Rebuilding libkeystone.
"
)
os
.
chdir
(
os
.
environ
[
'
SECURITY_TRANSFORMS_HOME
'
]
+
"
/third_party/keystone
"
)
os
.
system
(
"
mkdir -p ./build
"
)
os
.
chdir
(
"
build
"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment