[Forensics-changes] [SCM] debian-forensics/libguytools branch, debian, updated. debian/1.1.1-1-3-g2704459
Michael Prokop
mika at debian.org
Mon Jun 14 15:59:33 UTC 2010
The following commit has been merged in the debian branch:
commit 25c31912b2197975f624879e3b73e40d960e0b25
Author: Michael Prokop <mika at debian.org>
Date: Mon Jun 14 16:57:54 2010 +0200
Merging upstream version 2.0.1.
diff --git a/alltools b/alltools
deleted file mode 100755
index 542ab2d..0000000
--- a/alltools
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/bash
-#
-# Enter
-# ./alltools help
-# for additional information
-
-# Initialisation
-# --------------
-HighLightNeutral="\033[1;37;44m" # White on blue
-HighLightGood="\033[1;37;42m" # White on green
-HighLightBad="\033[1;37;41m" # White on red
-HighLightOff="\033[0m"
-
-SetTitleCommandStart="\033]0;"
-SetTitleCommandEnd='\007'
-
-
-if [ "$1" == "" ]; then
- DoClean=0
- DoDep=1
- DoCompile=1
-else
- if [ "$1" == "clean" ]; then
- DoClean=1
- DoDep=0
- DoCompile=0
- shift
- else
- if [ "$1" == "dep" ] || [ "$1" == "makemake" ] || [ "$1" == "qmake" ] || [ "$1" == "qmake-qt4" ]; then
- DoClean=0
- DoDep=1
- DoCompile=0
- shift
- else
- if [ "$1" == "make" ]; then
- DoClean=0
- DoDep=0
- DoCompile=1
- shift
- else
- if [ "$1" == "all" ]; then
- DoClean=1
- DoDep=1
- DoCompile=1
- shift
- else
- if [ "$1" == "help" ] || [ "$1" == "--help" ] || [ "$1" == "--h" ] || [ "$1" == "?" ]; then
- echo -e "Help for alltools"
- echo -e "-----------------"
- echo -e "Use this script for building all the CAT tools. The following commands are supported:"
- echo -e " ./alltools help Show this help text"
- echo -e " ./alltools Rebuild the dependencies and call make"
- echo -e " ./alltools clean Delete all the object, executable, etc. files"
- echo -e " ./alltools dep Rebuild the dependencies"
- echo -e " ./alltools makemake Same as ./alltools dep"
- echo -e " ./alltools make Call make"
- echo -e " ./alltools all Clean everything, then build the dependencies and compile"
- exit 0
- else
- echo -e "$HighLightBad Error: Unknown command $1 $HighLightOff"
- exit 1
- fi
- fi
- fi
- fi
- fi
-fi
-
-Parameters=$@
-
-
-# Subroutine calling make and checking for errors
-# -----------------------------------------------
-
-check_return_code()
-{
- ReturnCode=$?
- Command=$1
- if [ "$ReturnCode" -ne "0" ]; then
- echo -e "$HighLightBad Error: '$Command' returned $ReturnCode in tool '$SubDir' $HighLightOff"
- echo -e "$SetTitleCommandStart $SetTitleCommandEnd"
- exit 1
- fi
-}
-
-call_make_in_subdir()
-{
- SubDir=$1
- DepCommand=$2
- OldDir=`pwd`
-
- echo
- echo -e "$HighLightNeutral Processing tool '$SubDir' $HighLightOff"
- cd $SubDir
- echo -e "$SetTitleCommandStart NOW PROCESSING: tools/$SubDir $SetTitleCommandEnd"
-
- if [ "$DoClean" == "1" ]; then
- Command="make clean"
- echo -e "$Command"
- $Command
- check_return_code "$Command"
- fi
-
- if [ "$DoDep" == "1" ]; then
- Command=$DepCommand
- echo -e "$Command"
- $Command
- check_return_code "$Command"
- fi
-
- if [ "$DoCompile" == "1" ]; then
- #NumCpus=`cat /proc/cpuinfo | grep ^processor | wc -l`
- #Command="make -j"$NumCpus
- make
- echo -e "$Command"
- $Command
- check_return_code "$Command"
- fi
-
- cd $OldDir
-}
-
-
-if [ "$DoClean" == "1" ]; then
- Command="rm -f ./lib/*"
- echo -e "$Command"
- $Command
- check_return_code "$Command"
-fi
-
-# Generate library version from top entry found in debian/changelog
-# -----------------------------------------------------------------
-#head -n 1 debian/changelog | awk '{ Version = $2
-# gsub ("\\(", "", Version)
-# gsub ("\\)", "", Version)
-# print "VERSION = " Version}' > libguytools_version.pro.inc
-
-TOOLS_VERSION=`head -n 1 debian/changelog`
-TOOLS_VERSION="${TOOLS_VERSION%%)*}"
-TOOLS_VERSION="${TOOLS_VERSION##*(}"
-echo "VERSION = ${TOOLS_VERSION%%-*}" >libguytools_version.pro.inc
-
-
-# List of all sub projects
-#
-# Sub- Command for building
-# directory dependencies
-# ---------------------------------------------------
-
-call_make_in_subdir error "qmake-qt4"
-call_make_in_subdir sysinfo "qmake-qt4"
-call_make_in_subdir log "qmake-qt4"
-call_make_in_subdir signal "qmake-qt4"
-call_make_in_subdir cfg "qmake-qt4"
-
-echo -e "$HighLightGood Successfully finished $HighLightOff"
-echo -e "$SetTitleCommandStart $SetTitleCommandEnd"
-
diff --git a/cfg/toolcfg.pro b/cfg/toolcfg.pro
deleted file mode 100644
index 2dbc4f7..0000000
--- a/cfg/toolcfg.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET = guytoolcfg
-
-include( ../libguytools.pro.inc )
-
-DEFINES += TOCFG_COMPILE_FOR_USE_WITHOUT_TOOLBOX
-
-QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing # Switch off warning "dereferencing type-punned pointer will break strict-aliasing rules"
-
-SOURCES += toolcfg.cpp
-
-LIBS += -L../lib -lguytoolerror
-
diff --git a/create_version_file.sh b/create_version_file.sh
new file mode 100755
index 0000000..82a4fea
--- /dev/null
+++ b/create_version_file.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+TOOLS_VERSION=`head -n 1 debian/changelog`
+TOOLS_VERSION="${TOOLS_VERSION%%)*}"
+TOOLS_VERSION="${TOOLS_VERSION##*(}"
+echo "VERSION = ${TOOLS_VERSION%%-*}" >libguytools_version.pro.inc
+
diff --git a/error/toolerror.pro b/error/toolerror.pro
deleted file mode 100644
index bf78177..0000000
--- a/error/toolerror.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET = guytoolerror
-
-include( ../libguytools.pro.inc )
-
-SOURCES += toolerror.cpp
-
-
diff --git a/include/cfg/toolcfg.h b/include/toolcfg.h
similarity index 100%
rename from include/cfg/toolcfg.h
rename to include/toolcfg.h
diff --git a/include/error/toolerror.h b/include/toolerror.h
similarity index 100%
rename from include/error/toolerror.h
rename to include/toolerror.h
diff --git a/include/log/toollog.h b/include/toollog.h
similarity index 100%
rename from include/log/toollog.h
rename to include/toollog.h
diff --git a/include/signal/toolsignal.h b/include/toolsignal.h
similarity index 100%
rename from include/signal/toolsignal.h
rename to include/toolsignal.h
diff --git a/include/sysinfo/toolsysinfo.h b/include/toolsysinfo.h
similarity index 100%
rename from include/sysinfo/toolsysinfo.h
rename to include/toolsysinfo.h
diff --git a/libguytools.pro.inc b/libguytools.pro.inc
deleted file mode 100644
index c292586..0000000
--- a/libguytools.pro.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-TEMPLATE = lib
-DESTDIR = ../lib
-include( ./libguytools_version.pro.inc )
-
-
-# Remove qt, as the lib should be at best qt independant. If a certain sublib needs qt, it has to enabled it again.
-CONFIG -= qt
-CONFIG += warn_on thread release
-
-DEPENDPATH += ../include
-INCLUDEPATH += ../include
-
-# The following line allows the software to see its own version
-# (just for logging purpose). Many slashes and quotes... look at
-# result of it during compilation
-DEFINES += "LIBGUYTOOLS_VERSION=\\\""$$VERSION"\\\""
-
-
-QMAKE_CXXFLAGS_WARN_ON += -fmessage-length=0 # Tell g++ not to split messages into different lines
-QMAKE_CXXFLAGS_RELEASE += -O3
-
diff --git a/log/toollog.pro b/log/toollog.pro
deleted file mode 100644
index ba228ac..0000000
--- a/log/toollog.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TARGET = guytoollog
-
-include( ../libguytools.pro.inc )
-
-CONFIG += qt
-
-SOURCES += toollog.cpp
-
-
diff --git a/signal/toolsignal.pro b/signal/toolsignal.pro
deleted file mode 100644
index 850fe1a..0000000
--- a/signal/toolsignal.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = guytoolsignal
-
-include( ../libguytools.pro.inc )
-
-SOURCES += toolsignal.cpp
-
-LIBS += -L../lib -lguytoolerror
-
diff --git a/sysinfo/toolsysinfo.pro b/sysinfo/toolsysinfo.pro
deleted file mode 100644
index 2796d22..0000000
--- a/sysinfo/toolsysinfo.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TARGET = guytoolsysinfo
-
-include( ../libguytools.pro.inc )
-
-CONFIG += qt
-
-SOURCES += toolsysinfo.cpp
-
-LIBS += -L../lib -lguytoolerror
diff --git a/cfg/toolcfg.cpp b/toolcfg.cpp
similarity index 99%
rename from cfg/toolcfg.cpp
rename to toolcfg.cpp
index 4bd5a3d..64934e1 100644
--- a/cfg/toolcfg.cpp
+++ b/toolcfg.cpp
@@ -27,8 +27,8 @@
#include "tooltypes.h"
#include "toolglobalid.h"
#include "toolconstants.h"
-#include "error/toolerror.h"
-#include "cfg/toolcfg.h"
+#include "toolerror.h"
+#include "toolcfg.h"
/* ------------------------------ */
/* Constants */
diff --git a/error/toolerror.cpp b/toolerror.cpp
similarity index 99%
rename from error/toolerror.cpp
rename to toolerror.cpp
index 698c3ae..6a33b3b 100644
--- a/error/toolerror.cpp
+++ b/toolerror.cpp
@@ -16,7 +16,7 @@
#include "toolconstants.h"
#include "toolglobalid.h"
-#include "error/toolerror.h"
+#include "toolerror.h"
/* ------------------------------ */
/* Type & structure definitions */
diff --git a/log/toollog.cpp b/toollog.cpp
similarity index 98%
rename from log/toollog.cpp
rename to toollog.cpp
index bd884eb..9c06323 100755
--- a/log/toollog.cpp
+++ b/toollog.cpp
@@ -25,8 +25,8 @@
#include <qmutex.h>
#include "toolglobalid.h"
-#include "error/toolerror.h"
-#include "log/toollog.h"
+#include "toolerror.h"
+#include "toollog.h"
// -----------
diff --git a/tools.pro b/tools.pro
new file mode 100644
index 0000000..40d85ce
--- /dev/null
+++ b/tools.pro
@@ -0,0 +1,32 @@
+TEMPLATE = lib
+DESTDIR = ./lib
+TARGET = guytools
+
+include( ./libguytools_version.pro.inc )
+
+# The following line allows the software to see its own version
+# (just for logging purpose). Many slashes and quotes... look at
+# result of it during compilation
+DEFINES += "LIBGUYTOOLS_VERSION=\\\""$$VERSION"\\\""
+
+# Use the standard Qt configuration but remove the GUI part, as we do not need it.
+CONFIG += qt
+QT -= gui
+
+CONFIG += warn_on thread release
+DEFINES += TOCFG_COMPILE_FOR_USE_WITHOUT_TOOLBOX
+
+DEPENDPATH += ./include
+INCLUDEPATH += ./include
+
+QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing # Switch off warning "dereferencing type-punned pointer will break strict-aliasing rules"
+QMAKE_CXXFLAGS_WARN_ON += -fmessage-length=0 # Tell g++ not to split messages into different lines
+QMAKE_CXXFLAGS_RELEASE += -O3
+
+SOURCES += toollog.cpp
+SOURCES += toolerror.cpp
+SOURCES += toolsysinfo.cpp
+SOURCES += toolsignal.cpp
+SOURCES += toolcfg.cpp
+
+
diff --git a/signal/toolsignal.cpp b/toolsignal.cpp
similarity index 98%
rename from signal/toolsignal.cpp
rename to toolsignal.cpp
index 740bdd1..39118ba 100644
--- a/signal/toolsignal.cpp
+++ b/toolsignal.cpp
@@ -22,8 +22,8 @@
#include "tooltypes.h"
#include "toolglobalid.h"
-#include "signal/toolsignal.h"
-#include "error/toolerror.h"
+#include "toolsignal.h"
+#include "toolerror.h"
// ------------------------------------
// Constants
@@ -148,7 +148,7 @@ static void ToolSignalBacktraceHandler (int Signal, siginfo_t *pSignalInfo, void
#elif defined(__x86_64__)
pIP = (void*) pUContext->uc_mcontext.gregs[REG_RIP];
#elif defined(__hppa__)
- pIP = (void*) pUContext->uc_mcontext.sc_iaoq[0] & ~0×3UL;
+ pIP = (void*) pUContext->uc_mcontext.sc_iaoq[0] & ~0x3UL;
#elif (defined (__ppc__)) || (defined (__powerpc__))
pIP = (void*) pUContext->uc_mcontext.regs->nip;
#endif
diff --git a/toolsstatic.pro b/toolsstatic.pro
new file mode 100644
index 0000000..a46017a
--- /dev/null
+++ b/toolsstatic.pro
@@ -0,0 +1,3 @@
+CONFIG += static
+include( ./tools.pro )
+
diff --git a/sysinfo/toolsysinfo.cpp b/toolsysinfo.cpp
similarity index 97%
rename from sysinfo/toolsysinfo.cpp
rename to toolsysinfo.cpp
index 03a8475..fbf8bf7 100644
--- a/sysinfo/toolsysinfo.cpp
+++ b/toolsysinfo.cpp
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <limits.h>
#include <math.h>
+#include <stdio.h>
#include <cstdarg>
#include <unistd.h>
@@ -20,13 +21,13 @@
#include <netinet/in.h>
#include <linux/if.h>
-#include <qapplication.h>
+//#include <qapplication.h>
#include <qstring.h>
#include "toolconstants.h"
#include "toolglobalid.h"
-#include "error/toolerror.h"
-#include "sysinfo/toolsysinfo.h"
+#include "toolerror.h"
+#include "toolsysinfo.h"
// ------------------------------------
// Constants
diff --git a/trunk.pro b/trunk.pro
new file mode 100644
index 0000000..3337c02
--- /dev/null
+++ b/trunk.pro
@@ -0,0 +1,2 @@
+include( ./tools.pro )
+
--
debian-forensics/libguytools
More information about the forensics-changes
mailing list