.gitmodules

@@ -15,9 +15,9 @@
 [submodule "zipr"]
 	path = zipr
 	url = git@git.zephyr-software.com:allzp/zipr.git
-[submodule "zipr_sdk"]
+[submodule "zipr-sdk"]
 	path = zipr-sdk
-	url = git@git.zephyr-software.com:allnp/zipr_sdk.git
+	url = git@git.zephyr-software.com:opensrc/zipr-sdk.git
 [submodule "daffy"]
 	path = daffy
 	url = git@git.zephyr-software.com:allnp/daffy.git
@@ -27,21 +27,12 @@
 [submodule "IdaProServer"]
 	path = IdaProServer
 	url = git@git.zephyr-software.com:allnp/IdaProServer.git
-[submodule "zipr_large_only_plugin"]
-	path = zipr_large_only_plugin
-	url = git@git.zephyr-software.com:allnp/zipr_large_only_plugin.git
 [submodule "zipr_callbacks"]
 	path = zipr_callbacks
 	url = git@git.zephyr-software.com:allnp/zipr_callbacks.git
 [submodule "zipr_unpin_plugin"]
 	path = zipr_unpin_plugin
 	url = git@git.zephyr-software.com:allnp/zipr_unpin_plugin.git
-[submodule "zipr_relax_plugin"]
-	path = zipr_relax_plugin
-	url = git@git.zephyr-software.com:allnp/zipr_relax_plugin.git
-[submodule "zipr_trace_plugin"]
-	path = zipr_trace_plugin
-	url = git@git.zephyr-software.com:allnp/zipr_trace_plugin.git
 [submodule "zipr_push64_reloc_plugin"]
 	path = zipr_push64_reloc_plugin
 	url = git@git.zephyr-software.com:allnp/zipr_push64_reloc_plugin.git
@@ -50,7 +41,7 @@
 	url = git@git.zephyr-software.com:allnp/zipr_install.git
 [submodule "irdb-sdk"]
 	path = irdb-sdk
-	url = git@git.zephyr-software.com:allnp/irdb-sdk.git
+	url = git@git.zephyr-software.com:opensrc/irdb-sdk.git
 [submodule "irdb-libs/libcapstone"]
 	path = irdb-libs/third_party/capstone
 	url = https://github.com/aquynh/capstone.git
@@ -59,7 +50,7 @@
 	url = git@git.zephyr-software.com:opensrc/libehp.git
 [submodule "irdb-libs/third_party/elfio-code"]
 	path = irdb-libs/third_party/elfio-code
-	url = http://git.code.sf.net/p/elfio/code
+	url = git@git.zephyr-software.com:third-party-mirrors/ELFIO.git
 [submodule "irdb-libs/third_party/pebliss"]
 	path = irdb-libs/third_party/pebliss
 	url = git@git.zephyr-software.com:third-party-mirrors/pebliss.git

SConscript

@@ -42,18 +42,18 @@ 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);
+
+
+#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
 	'''

cicd_testing/basic-pgms-fixcalls.sh

@@ -4,7 +4,6 @@ set -x
 
 cd /tmp/peasoup_test
 source set_env_vars
-cd $CICD_TO_TEST_DIR/peasoup_examples/tests
 cd $PEASOUP_HOME/tests
 make clean; 
 ./test_cmds.sh -c fix_calls_rida -l -a "bzip2 tcpdump"

cicd_testing/basic-pgms-killdeads.sh

@@ -4,7 +4,6 @@ set -x
 
 cd /tmp/peasoup_test
 source set_env_vars
-cd $CICD_TO_TEST_DIR/peasoup_examples/tests
 cd $PEASOUP_HOME/tests
 make clean; 
 ./test_cmds.sh -c kill_deads_rida -l -a "tcpdump"

cicd_testing/basic-pgms-rida-p1.sh

@@ -4,6 +4,7 @@ set -x
 
 cd /tmp/peasoup_test
 source set_env_vars
-cd $CICD_TO_TEST_DIR/peasoup_examples/tests
-cd $PEASOUP_HOME/tests; make clean; ./test_cmds.sh -l -c rida_p1
+cd $PEASOUP_HOME/tests
+make clean
+./test_cmds.sh -l -c rida_p1
 

cicd_testing/eh-tests.sh

@@ -4,7 +4,6 @@ set -x
 
 cd /tmp/peasoup_test
 source set_env_vars
-cd $CICD_TO_TEST_DIR/peasoup_examples/cpp-examples
-cd $PEASOUP_HOME/cpp-examples
+cd $CICD_TO_TEST_DIR/examples/cpp-examples
 ./test_quick.sh