renamed capstone path to be under third_party software

.gitmodules

@@ -52,7 +52,7 @@
 	path = irdb-sdk
 	url = git@git.zephyr-software.com:allnp/irdb-sdk.git
 [submodule "irdb-libs/libcapstone"]
-	path = irdb-libs/libcapstone
+	path = irdb-libs/third_party/capstone
 	url = https://github.com/aquynh/capstone.git
 [submodule "irdb-libs/libehp"]
 	path = irdb-libs/libehp

irdb-libs/SConscript

@@ -11,10 +11,10 @@ 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")
-    os.chdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone")
+    os.chdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/third_party/capstone")
     os.system("make clean")
-    if os.path.exists(os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone/zipr_unpack"):
-    	shutil.rmtree(os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone/zipr_unpack")
+#    if os.path.exists(os.environ['SECURITY_TRANSFORMS_HOME']+"/third_party/capstone/zipr_unpack"):
+#    	shutil.rmtree(os.environ['SECURITY_TRANSFORMS_HOME']+"/third_party/capstone/zipr_unpack")
     os.chdir(os.environ['SECURITY_TRANSFORMS_HOME'])
 
 
@@ -26,16 +26,16 @@ else:
 	#shutil.copy( os.path.join(os.environ['SECURITY_TRANSFORMS_HOME'],"include",machine,"config.h"), 
 		     #os.path.join(os.environ['SECURITY_TRANSFORMS_HOME'],"include","targ-config.h"))
 
-    os.chdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone")
+    os.chdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/third_party/capstone")
     print "Rebuilding libcapstone."
     jobs=env.GetOption('num_jobs')
     os.system("make -j "+str(jobs))
-    os.chdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone")
-    if not os.path.exists(os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone/zipr_unpack"):
-	    os.mkdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone/zipr_unpack")
-	    os.chdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone/zipr_unpack")
-            print "Unpacking libcapstone.a for libIRDB-core."
-	    os.system("ar x "+os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone/libcapstone.a")
+#    os.chdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/third_party/capstone")
+#    if not os.path.exists(os.environ['SECURITY_TRANSFORMS_HOME']+"/third_party/capstone/zipr_unpack"):
+#	    os.mkdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/third_party/capstone/zipr_unpack")
+#	    os.chdir(os.environ['SECURITY_TRANSFORMS_HOME']+"/third_party/capstone/zipr_unpack")
+#            print "Unpacking libcapstone.a for libIRDB-core."
+#	    os.system("ar x "+os.environ['SECURITY_TRANSFORMS_HOME']+"/libcapstone/libcapstone.a")
     os.chdir(os.environ['SECURITY_TRANSFORMS_HOME'])
 
 
@@ -62,7 +62,7 @@ if "CYGWIN" in sysname:
 Export('env')
 
 # get the libcapstone.so.[version] file regardless of the version extension
-libcapstone_path = Glob(os.environ['SECURITY_TRANSFORMS_HOME']+'/libcapstone/libcapstone.so.*')
+libcapstone_path = Glob(os.environ['SECURITY_TRANSFORMS_HOME']+'/third_party/capstone/libcapstone.so.*')
 assert len(libcapstone_path) <= 1, "More than one candidate for libcapstone.so.[version]?!"
 
 libcapstone_path = env.Install("$SECURITY_TRANSFORMS_HOME/lib/", libcapstone_path)

irdb-libs/libIRDB-core/src/SConscript

@@ -42,14 +42,12 @@ cpppath='''
 	$IRDB_SDK/include/
 	$SECURITY_TRANSFORMS_HOME/include/
 	$SECURITY_TRANSFORMS_HOME/libIRDB-core/include/
-	$SECURITY_TRANSFORMS_HOME/libcapstone/include/capstone/
+	$SECURITY_TRANSFORMS_HOME/third_party/capstone/include/capstone/
 	'''
 libpath='''
 	$SECURITY_TRANSFORMS_HOME/lib
         '''
 
-#globs=glob.glob(os.environ['SECURITY_TRANSFORMS_HOME']+'/libcapstone/zipr_unpack/*.o')
-
 myenv.Append(CCFLAGS=" -Wall -std=c++11 -fmax-errors=2 ")
 myenv.Append(LIBPATH=libpath)
 

irdb-libs/rida/SConscript

@@ -10,7 +10,7 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/include 
 	 $SECURITY_TRANSFORMS_HOME/libehp/include 
 	 $SECURITY_TRANSFORMS_HOME/libEXEIO/include 
-	 $SECURITY_TRANSFORMS_HOME/libcapstone/include 
+	 $SECURITY_TRANSFORMS_HOME/third_party/capstone/include 
 	'''
 
 
@@ -21,7 +21,6 @@ pgm="rida.exe"
 
 LIBPATH=Split('''
 	$SECURITY_TRANSFORMS_HOME/lib 
-	$SECURITY_TRANSFORMS_HOME/libcapstone
 	''')
 LIBS=Split("ehp EXEIO pebliss capstone") 
 myenv=myenv.Clone(CPPPATH=Split(cpppath))