.gitignore

@@ -2,4 +2,6 @@ installed
 manifest.txt.config
 ubuntu16_files/manifest.txt.config
 zest_runtime
+.sconsign.dblite
+build
 

.gitmodules

@@ -42,9 +42,6 @@
 [submodule "zipr_unpin_plugin"]
 	path = zipr_unpin_plugin
 	url = git@git.zephyr-software.com:allnp/zipr_unpin_plugin.git
-[submodule "zipr_scfi_plugin"]
-	path = zipr_scfi_plugin
-	url = git@git.zephyr-software.com:allzp/zipr_scfi_plugin.git
 [submodule "zipr_relax_plugin"]
 	path = zipr_relax_plugin
 	url = git@git.zephyr-software.com:allnp/zipr_relax_plugin.git
@@ -60,6 +57,3 @@
 [submodule "irdb-sdk"]
 	path = irdb-sdk
 	url = git@git.zephyr-software.com:allnp/irdb-sdk.git
-[submodule "zipr_xeon_plugin"]
-	path = zipr_xeon_plugin
-	url = git@git.zephyr-software.com:allnp/xeon_plugin

SConscript

+import shutil
+import os
+import tarfile
+
+Import('env')
+
+def createFolder(directory):
+    try:
+        if not os.path.exists(directory):
+            os.makedirs(directory)
+    except OSError:
+        print ('Error: Creating directory. ' +  directory)
+
+
+
+createFolder(os.environ['ZEST_RUNTIME']+'/lib32')
+createFolder(os.environ['ZEST_RUNTIME']+'/lib64')
+createFolder(os.environ['ZEST_RUNTIME']+'/sbin')
+createFolder(os.environ['ZEST_RUNTIME']+'/bin')
+
+
+#if [ ! -f manifest.txt.config -o ! -d "$PS_INSTALL" ]; then
+
+if not os.path.isfile("manifest.txt.config"):
+	os.system("$PEDI_HOME/pedi --setup -m manifest.txt -l ida -l ida_key -l ps -l zipr -l stars -i $PS_INSTALL")
+else:
+	print "Pedi already setup"  
+
+
+
+# build stars and libirdb
+libirdb=      SConscript("irdb-libs/SConscript") # , variant_dir='build/irdb-libs')
+libsmpsa=     SConscript("SMPStaticAnalyzer/SConscript") # 
+
+
+# specify some explicit dependencies to make sure these build in order
+Depends(libsmpsa,libirdb)
+
+# now finish building irdb-libs once stars is setup
+libirdbdeep=SConscript("irdb-libs/SConscript.deep", variant_dir='build/irdb-libs')
+Depends(libirdbdeep,libsmpsa)
+
+print "Zipr install is "+env['ZIPR_INSTALL']
+Export('env')
+libtrace=env.SConscript(["zipr_trace_plugin/libtrace/SConscript"])
+print "Zipr install is "+env['ZIPR_INSTALL']
+zipr_trace_plugin=SConscript(["zipr_trace_plugin/SConscript"])
+Depends(zipr_trace_plugin,libtrace);
+
+
+# list of zipr plugins and irdb xforms to build
+transformDirs='''
+	zipr_large_only_plugin
+	irdb_transforms
+	zipr_push64_reloc_plugin
+	zipr_relax_plugin
+	zipr
+	zipr_unpin_plugin
+	'''
+
+# build the xforms and plugins
+xforms=list()
+for i in Split(transformDirs):
+	Export('env')
+	xform = SConscript(i+"/SConscript")
+	Depends(xform, libirdbdeep)
+	xforms = xforms + xform 
+
+
+#finally, run pedi to do the final install
+
+pedi = Command( target = "./testoutput-install",
+		source = "./SConscript",
+		action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
+
+Depends(pedi,  xforms)
+Default( pedi )
+
+if env.GetOption('clean') and os.path.isfile("manifest.txt.config"):
+	with open("manifest.txt.config") as myfile:
+	    first_line=myfile.readlines()[0] #put here the interval you want
+
+	first_line=first_line.rstrip()
+
+	# if [[ $(head -1 manifest.txt.config) == $PS_INSTALL ]] ; then
+	if str(first_line) == str(os.environ['PS_INSTALL']):
+		print "Doing pedi clean"
+		os.system( "pwd; $PEDI_HOME/pedi -c -m manifest.txt " )
+		shutil.rmtree(os.environ['PS_INSTALL'])
+	else:
+		print "Eliding pedi clean as I'm not the root" 
+		print "Root is '"+first_line+"'"
+		print "I am    '"+str(os.environ['PS_INSTALL'])+"'"
+

SConstruct

+import os
+import sys
+
+env=Environment()
+
+
+# default build options
+env.Replace(CFLAGS="   -fPIC -fmax-errors=2 -Wall -Werror -fmax-errors=2 ")
+env.Replace(CXXFLAGS=" -fPIC -fmax-errors=2 -Wall -Werror -fmax-errors=2 ")
+env.Replace(LINKFLAGS="-fPIC -fmax-errors=2 -Wall -Werror -fmax-errors=2 -Wl,-unresolved-symbols=ignore-in-shared-libs ")
+env.Replace(SHLINKFLAGS="-fPIC -fmax-errors=2 -Wall -Werror -fmax-errors=2 -shared ") # default is ignore all link errors
+
+# parse arguments into env and set default values.
+env.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
+env.Replace(IRDB_SDK=os.environ['IRDB_SDK'])
+env.Replace(SMPSA_HOME=os.environ['SMPSA_HOME'])
+env.Replace(debug=ARGUMENTS.get("debug",0))
+env.Replace(PEDI_HOME=os.environ['PEDI_HOME'])
+env.Replace(ZIPR_INSTALL=os.environ['ZIPR_INSTALL'])
+
+
+
+if int(env['debug']) == 1:
+        print "Setting debug mode"
+        env.Append(CFLAGS="      -g ")
+        env.Append(CXXFLAGS="    -g ")
+	env.Append(LINKFLAGS="   -g ")
+	env.Append(SHLINKFLAGS=" -g ")
+else:
+        print "Setting release mode"
+        env.Append(CFLAGS="      -O ")
+        env.Append(CXXFLAGS="    -O ")
+        env.Append(LINKFLAGS="   -O  ")
+        env.Append(SHLINKFLAGS=" -O  ")
+
+Export('env')
+SConscript("SConscript")
+

SMPStaticAnalyzer @ 661cc55f

-Subproject commit ac449438c65065002cde8f229ba69eececa678f2
+Subproject commit 661cc55f103c79efef0be4707a0c6a509fe9493c

build-all.sh

 #!/bin/bash
 
+
+
+if [[ "$*" =~ "--debug" ]]; then
+	SCONSDEBUG=" debug=1 "
+fi
+
+scons $SCONSDEBUG -j 3
+
+exit
+
+
+
 # check if DIR is the directory containing the build script.
 BUILD_LOC=`dirname $0`
 FULL_BUILD_LOC=`cd $BUILD_LOC; pwd`

clean-all.sh

 #!/bin/bash
 
+scons -c
+
+exit
+
+
 # check if DIR is the directory containing the build script.
 BUILD_LOC=`dirname $0`
 FULL_BUILD_LOC=`cd $BUILD_LOC; pwd`

irdb-libs @ 608b5a7f

-Subproject commit d1cf03ff37a850d7fb98b16458747411ac083638
+Subproject commit 608b5a7fbd65a0b622b976db1fa0687b74bd85d8

irdb_transforms @ e2ce3141

-Subproject commit b53be562746eb6e6a677205116fdeed64c4504ed
+Subproject commit e2ce31411ac8a046841dbad9b97d141450d15446

peasoup_examples @ 47b1904e

-Subproject commit 7851e908cacc51ce338bb455a05b8754e6d07071
+Subproject commit 47b1904e6506b47275773a2d39e8994102766e2c

pedi @ 5008cbd8

-Subproject commit d4f06f290475e748c1fd9938c9f309292a1315da
+Subproject commit 5008cbd8ded1f7ccb4f36eec909894d0e11afe47

zipr @ 2719f298

-Subproject commit 5b986cf6ee06139c4659da6218d4fc1d3b14c708
+Subproject commit 2719f29880e8c12d00352f2972300103d6ea0340

zipr_install @ b2e97e9f

-Subproject commit 3c03d1d879d783a880b7989c38c5d83fe92e1c84
+Subproject commit b2e97e9fe880ebd58b46503071acceb1de1cd07f

zipr_large_only_plugin @ 9f42174f

-Subproject commit 12339c9789869e11d7d13925eb0f6e34cdeccfc4
+Subproject commit 9f42174fbebbd4b34fbb7c544fff48fb0eacaa24

zipr_push64_reloc_plugin @ add98bda

-Subproject commit 356757cf051c251f61d55bfc59bc5255b59f5d4a
+Subproject commit add98bda82ff3f815dc72c2f50c46f69fa93caf3

zipr_relax_plugin @ be4f3316

-Subproject commit 82783bd2f3ffb67fc4d7535bc56553551183eae7
+Subproject commit be4f331648edf94d2c35f3a4d3b6b8bb684918fe

zipr_scfi_plugin @ 117d8f42

-Subproject commit 117d8f422006cc72d3a8109ad55e367585a18057

zipr_trace_plugin @ 43882c93

-Subproject commit 246f0706c720c3c4d5908d9c401c29f508729b63
+Subproject commit 43882c9317752a6c79f67df65aa1fedb416b2d2f

zipr_unpin_plugin @ 0aa72542

-Subproject commit 1c1e26a1c38ed817a22c1f01742960725346d62a
+Subproject commit 0aa7254238a9ff6e5f0c16c6f0a3d7e90cd95102

zipr_xeon_plugin @ 46d1a74b

-Subproject commit 46d1a74bc5f1b8504a3d0e04cf770351aecb8582