preparations for the standalone x11 build

6 files changed, 109 insertions, 48 deletions

diff --git a/noncore/net/wellenreiter/README b/noncore/net/wellenreiter/README
index a4541b4..291f1fe 100644
--- a/noncore/net/wellenreiter/README
+++ b/noncore/net/wellenreiter/README
@@ -1,86 +1,67 @@
 /************************************************************************
 /*                W e l l e n r e i t e r   I I
 /*               ===============================
 /*
-                     Version: Opie-ALPHA-April
+/*                    Version: ALPHA-2-April
 /************************************************************************
 
 ----------------------------------------------------
 Release Notes for Opie-ALPHA Version April 2003
 ----------------------------------------------------
 
 =====================
 =  Supported Devices
 =====================
 
-- HERMES chipset [ orinoco or hostap ], e.g. Lucent/Agere cards
-- PRISM2 chipset [ orinoco or hostap ], e.g. D-Link, Buffallo
-- SYMBOL/SPECTRUM chipset* [ orinoco ], e.g. Symbol Spectrum 24, Socket Lowpower CF
+- HERMES chipset [ orinoco or hostap ], e.g. Lucent/Agere cards, ...
+- PRISM2 chipset [ orinoco or hostap ], e.g. D-Link, Buffallo, ...
+- SYMBOL/SPECTRUM chipset [ orinoco ], e.g. Symbol Spectrum 24, Socket Lowpower CF, ...
 - CISCO chipset
--
-
-* Warning: Current Symbol/Spectrum CF drivers have bugs - they freeze the system in monitor mode.
-           This has nothing todo with Wellenreiter as its a driver problem.
+- wlan-ng supported chipsets
 
 =====================
 =        Build
 =====================
 
-(I) Opie Build Environment
-
-To compile Wellenreiter within the Opie build environment, do
-'make menuconfig' and check Wellenreiter in the subsection
-"Communications and Networking". Make sure you have enabled the
-dependencies in "Experimental->libopie2"
-
-'make SUBDIRS=noncore/net/wellenreiter' or 'make' (to build everything)
-Note that you need to have libpcap in your toolchain.
-
-(II) OpenZaurus Build Environment
-
-See (I), but you must build a complete opie via 'make SUBDIRS=packages/opie'
+To compile a standalone Wellenreiter for X11, you need Qt3 and the development
+packages for Qt3, e.g. libqt3-devel.
 
-(III) To compile a standalone Wellenreiter for X11, you need Qt3 and the development
-packages for Qt3, e.g. libqt3-devel. Assuming, $QTDIR is set to your Qt-Director
-(e.g. /usr/lib/qt3), set $OPIEDIR to the root of the checked out Opie, then
-'export QMAKESPEC=$QTDIR/mkspecs/linux-g++'
-'cd noncore/net/wellenreiter'
-'qmake "platform=x11" wellenreiter.pro'
-'make SUBDIRS=noncore/net/wellenreiter'
-'make install'
+ * Set $QTDIR to the appropriate directory (e.g. /usr/lib/qt3)
+ * './build make'
+ * as root, './build install'
+ * Wellenreiter will be installed in /usr/local
 
 =====================
-=     Install
+= Precompiled Binaries
 =====================
 
-Alternatively, you can use our precompiled ipk. Get it from
-http://opie.net.wox.org/wellenreiter/ where you will also
-find all necessary dependencies.
+Precompiled binaries are available for the PDA-Version.
+Get them from http://opie.net.wox.org/wellenreiter/
 
 =====================
 =       Run
 =====================
 
 * Configure your device by pressing the configure toolbutton (to the right)
 * Start Sniffing by pressing the execute toolbutton which will be enabled,
-if your device has been configured.
+if your device has been properly configured.
 
 =====================
 =     Credits       =
 =====================
 
 Wellenreiter II is (C) 2002-2003 M-M-M
 
-Sniffer Engine:             Max Moser        <max@remote-exploit.org>
-Communication and Protocol: Martin J. Muench <mjm@remote-exploit.org>
-GUI and Packaging:          Michael Lauer    <mickeyl@handhelds.org>
+Max Moser        <max@remote-exploit.org>
+Martin J. Muench <mjm@remote-exploit.org>
+Michael Lauer    <mickeyl@handhelds.org>
 
 =====================
 =      Links        =
 =====================
 
-Opie Project:               http://opie.handhelds.org
-OpenZaurus Project:         http://openzaurus.org
 Wellenreiter:               http://www.remote-exploit.org
 Wellenreiter/Opie:          http://opie.net.wox.org/wellenreiter
+Opie Project:               http://opie.handhelds.org
+OpenZaurus Project:         http://openzaurus.org
 
diff --git a/noncore/net/wellenreiter/build b/noncore/net/wellenreiter/build
new file mode 100755
index 0000000..44eb8d8
--- a/dev/null
+++ b/noncore/net/wellenreiter/build
@@ -0,0 +1,28 @@
+##########################################
+# Wellenreiter X11 standalone build script #
+##########################################
+
+PREFIX=/usr/local
+
+# ------------------- do not change anything below
+
+if [ -z $QTDIR ]
+then
+    echo "*** ERROR: QTDIR is not set. QTDIR must point to your Qt directory, e.g. /usr/lib/qt3"
+    exit
+fi
+
+export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+export OPIEDIR=$PWD
+export PATH=$QTDIR/bin:$PATH
+qmake "platform=x11" wellenreiter.pro
+
+
+case "$1" in
+compile) make;;
+install) cp -dfR output/* $PREFIX/;;
+*) echo "Usage: ./build [compile|install]"; exit;;
+esac
+
+
+
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 59c2a61..ba1119e 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -13,88 +13,88 @@
 **
 **********************************************************************/
 
 /* LOCAL */
 #include "configwindow.h"
 
 /* QT */
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qmap.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 
 /* OPIE */
 #include <opie2/onetwork.h>
 
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
 
 WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
            :WellenreiterConfigBase( parent, name, true, f )
 {
     _devicetype[ "cisco" ] = 1;
     _devicetype[ "wlan-ng" ] = 2;
     _devicetype[ "hostap" ] = 3;
     _devicetype[ "orinoco" ] = 4;
     _devicetype[ "<manual>" ] = 5;
 
     // gather possible interface names from ONetwork
     ONetwork* net = ONetwork::instance();
     ONetwork::InterfaceIterator it = net->iterator();
     while ( it.current() )
     {
         if ( it.current()->isWireless() )
             interfaceName->insertItem( it.current()->name() );
         ++it;
     }
 
     // try to guess device type
     QFile m( "/proc/modules" );
     if ( m.open( IO_ReadOnly ) )
     {
         int devicetype(0);
         QString line;
         QTextStream modules( &m );
         while( !modules.atEnd() && !devicetype )
         {
             modules >> line;
             if ( line.contains( "cisco" ) ) devicetype = 1;
             else if ( line.contains( "hostap" ) ) devicetype = 3;
             else if ( line.contains( "prism" ) ) devicetype = 2;
             else if ( line.contains( "orinoco" ) ) devicetype = 4;
         }
         if ( devicetype )
         {
             deviceType->setCurrentItem( devicetype );
             qDebug( "Wellenreiter: guessed device type to be %d", devicetype );
         }
     }
 
     #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
     QPushButton* okButton = new QPushButton( "ok", this );
     okButton->show();
-    Layout5_2->addWidget( okButton ); //FIXME: rename this in configbase.ui
+    Layout5_2->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui
     connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
     #endif
 
     WellenreiterConfigWindow::_instance = this;
 };
 
 int WellenreiterConfigWindow::daemonDeviceType()
 {
     QString name = deviceType->currentText();
     if ( _devicetype.contains( name ) )
     {
         return _devicetype[name];
     }
     else
     {
         return 0;
     }
 };
 
 int WellenreiterConfigWindow::daemonHopInterval()
 {
     return hopInterval->cleanText().toInt();
 }
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 5a8972c..5970b01 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,42 +1,43 @@
 MOC_DIR         = ./tmp
 OBJECTS_DIR     = ./tmp
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 
 HEADERS         = wellenreiterbase.h \
                   mainwindow.h \
                   wellenreiter.h \
                   scanlist.h \
                   logwindow.h \
                   hexwindow.h \
                   configwindow.h \
                   manufacturers.h
 
 SOURCES         = main.cpp \
                   mainwindow.cpp \
                   wellenreiterbase.cpp \
                   wellenreiter.cpp \
                   scanlist.cpp \
                   logwindow.cpp \
                   hexwindow.cpp \
                   configwindow.cpp \
                   manufacturers.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
 
 !contains( platform, x11 ) {
   message( qws )
   include ( $(OPIEDIR)/include.pro )
   LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2
 }
 
 contains( platform, x11 ) {
-  LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lwellenreiter
+  LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
   SOURCES += resource.cpp
   HEADERS += resource.h
+  DESTDIR = $(OPIEDIR)/output/bin
 }
 
diff --git a/noncore/net/wellenreiter/lib/lib.pro b/noncore/net/wellenreiter/lib/lib.pro
index 8728323..e36db11 100644
--- a/noncore/net/wellenreiter/lib/lib.pro
+++ b/noncore/net/wellenreiter/lib/lib.pro
@@ -1,28 +1,25 @@
 MOC_DIR         = ./tmp
 OBJECTS_DIR     = ./tmp
-DESTDIR         = $(OPIEDIR)/lib
+DESTDIR         = $(OPIEDIR)/output/lib
 TEMPLATE        = lib
 CONFIG          = qt warn_on debug
 
 HEADERS         = $(OPIEDIR)/libopie2/opieui/olistview.h \
                   $(OPIEDIR)/libopie2/opienet/onetutils.h \
+                  $(OPIEDIR)/libopie2/opienet/omanufacturerdb.h \
                   $(OPIEDIR)/libopie2/opienet/onetwork.h \
                   $(OPIEDIR)/libopie2/opienet/opcap.h
 
 SOURCES         = $(OPIEDIR)/libopie2/opieui/olistview.cpp \
                   $(OPIEDIR)/libopie2/opienet/onetutils.cpp \
+                  $(OPIEDIR)/libopie2/opienet/omanufacturerdb.cpp \
                   $(OPIEDIR)/libopie2/opienet/onetwork.cpp \
                   $(OPIEDIR)/libopie2/opienet/opcap.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS            = -lpcap
+LIBS            = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap
 TARGET          = wellenreiter
 VERSION         = 1.0.0
 
-contains( platform, x11 ) {
-  LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
-  SOURCES += resource.cpp
-  HEADERS += resource.h
-}
 
diff --git a/noncore/net/wellenreiter/makedist.sh b/noncore/net/wellenreiter/makedist.sh
new file mode 100755
index 0000000..1795ae5
--- a/dev/null
+++ b/noncore/net/wellenreiter/makedist.sh
@@ -0,0 +1,54 @@
+VERSION=2-alpha2
+
+TGZDIR=$PWD
+
+# script to make a .tgz distributable for the Wellenreiter X11 Standalone Version
+
+find . -name "*.o"|xargs rm -f
+find . -name "Makefile"|xargs rm -f
+find . -name "*moc*"|xargs rm -f
+#TMPFILE=`mktemp -d -q /tmp/build.XXXXXX`
+TMPFILE=/tmp/build
+#if [ $? -ne 0 ]; then
+#        echo "$0: Can't create temp file, exiting..."
+#        exit 1
+#fi
+
+TMPDIR=$TMPFILE/wellenreiter$VERSION
+OUTPUT=$TMPDIR/output
+
+mkdir -p $TMPDIR/libopie2/opieui
+mkdir -p $TMPDIR/libopie2/opienet
+mkdir -p $TMPDIR/include/opie2
+mkdir -p $OUTPUT/share/wellenreiter/pics
+mkdir -p $OUTPUT/share/wellenreiter
+cp -dfR gui $TMPDIR
+cp -dfR lib $TMPDIR
+cp -dfR build README wellenreiter.pro $TMPDIR
+cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/
+cp -dfR $OPIEDIR/share/wellenreiter/* $OUTPUT/share/wellenreiter/
+
+# take care about sourcefiles
+
+FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \
+      libopie2/opienet/opcap.h libopie2/opienet/opcap.cpp libopie2/opienet/802_11_user.h \
+      libopie2/opienet/onetutils.h libopie2/opienet/onetutils.cpp \
+      libopie2/opienet/omanufacturerdb.h libopie2/opienet/omanufacturerdb.cpp \
+      libopie2/opieui/olistview.cpp libopie2/opieui/olistview.h"
+
+for i in $FILES
+    do cp -dfR $OPIEDIR/$i $TMPDIR/$i
+done
+
+# make includes
+pushd $TMPDIR/include/opie2
+ln -sf ../../libopie2/opieui/*.h .
+ln -sf ../../libopie2/opienet/*.h .
+popd
+
+find $TMPDIR -name "CVS"|xargs rm -rf
+
+pushd $TMPFILE
+tar czf $TGZDIR/wellenreiter$VERSION.tgz wellenreiter$VERSION
+popd
+