Changeset 28869 for main/trunk/greenstone2/runtime-src/packages

Timestamp:

2014-03-04T15:54:09+13:00 (10 years ago)

Author:

ak19

Message:

esapi test code expects SafeInt header file to be located inside a safeint folder in installed/include

Location:

main/trunk/greenstone2/runtime-src/packages/security

Files:

• CASCADE-MAKE.sh (modified) (2 diffs)
• CASCADE-MAKE/OWASPCPP.sh (modified) (1 diff)

main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE.sh

@@ -61 +61 @@
 done
 
-# Copy across the Safe Integer header file
-cp safeint/SafeInt3.hpp $installdir/include/.
+# Copy across the Safe Integer header file, with its folder structure
+#cp safeint/SafeInt3.hpp $installdir/include/.
+cp -r safeint $installdir/include/.
 
 # Make a symbolic link to cryptopp-version-no. that's called cryptopp
@@ -73 +74 @@
 # COMPILE
 # Basically, we run the <package>.sh file in the CASCADE-MAKE folder for each package
-# each package's .sh file will cd into the package's folder (stored in the exported compiledir var)
+# Each package's .sh file will cd into the package's folder (stored in the exported compiledir var)
 # and then run configure, make and install steps as applicable.
 

main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE/OWASPCPP.sh

@@ -10 +10 @@
 
 # else, make and make install
-cxxflags="-I$installdir -I$installdir/include" 
+cxxflags="-I$installdir -I$installdir/include -I$installdir/include/safeint" 
 ldflags="-L$installdir/lib"