author | mickeyl <mickeyl> | 2003-04-08 16:43:20 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-08 16:43:20 (UTC) |
commit | 89100a32b43b7eda68aaa19bc275a0fb7ce36e30 (patch) (unidiff) | |
tree | 7538662f3b5a0b8b657013bb82ba02f7d57fc80b | |
parent | 0d48ba39224582c83d68c2938e6cbedc4c77ec7d (diff) | |
download | opie-89100a32b43b7eda68aaa19bc275a0fb7ce36e30.zip opie-89100a32b43b7eda68aaa19bc275a0fb7ce36e30.tar.gz opie-89100a32b43b7eda68aaa19bc275a0fb7ce36e30.tar.bz2 |
preparations for the standalone x11 build
-rw-r--r-- | noncore/net/wellenreiter/README | 59 | ||||
-rwxr-xr-x | noncore/net/wellenreiter/build | 28 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/lib/lib.pro | 11 | ||||
-rwxr-xr-x | noncore/net/wellenreiter/makedist.sh | 54 |
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 | |||
@@ -3,5 +3,5 @@ | |||
3 | /* =============================== | 3 | /* =============================== |
4 | /* | 4 | /* |
5 | Version: Opie-ALPHA-April | 5 | /* Version: ALPHA-2-April |
6 | /************************************************************************ | 6 | /************************************************************************ |
7 | 7 | ||
@@ -14,12 +14,9 @@ Release Notes for Opie-ALPHA Version April 2003 | |||
14 | ===================== | 14 | ===================== |
15 | 15 | ||
16 | - HERMES chipset [ orinoco or hostap ], e.g. Lucent/Agere cards | 16 | - HERMES chipset [ orinoco or hostap ], e.g. Lucent/Agere cards, ... |
17 | - PRISM2 chipset [ orinoco or hostap ], e.g. D-Link, Buffallo | 17 | - PRISM2 chipset [ orinoco or hostap ], e.g. D-Link, Buffallo, ... |
18 | - SYMBOL/SPECTRUM chipset* [ orinoco ], e.g. Symbol Spectrum 24, Socket Lowpower CF | 18 | - SYMBOL/SPECTRUM chipset [ orinoco ], e.g. Symbol Spectrum 24, Socket Lowpower CF, ... |
19 | - CISCO chipset | 19 | - CISCO chipset |
20 | - | 20 | - wlan-ng supported chipsets |
21 | |||
22 | * Warning: Current Symbol/Spectrum CF drivers have bugs - they freeze the system in monitor mode. | ||
23 | This has nothing todo with Wellenreiter as its a driver problem. | ||
24 | 21 | ||
25 | ===================== | 22 | ===================== |
@@ -27,34 +24,18 @@ Release Notes for Opie-ALPHA Version April 2003 | |||
27 | ===================== | 24 | ===================== |
28 | 25 | ||
29 | (I) Opie Build Environment | 26 | To compile a standalone Wellenreiter for X11, you need Qt3 and the development |
30 | 27 | packages for Qt3, e.g. libqt3-devel. | |
31 | To compile Wellenreiter within the Opie build environment, do | ||
32 | 'make menuconfig' and check Wellenreiter in the subsection | ||
33 | "Communications and Networking". Make sure you have enabled the | ||
34 | dependencies in "Experimental->libopie2" | ||
35 | |||
36 | 'make SUBDIRS=noncore/net/wellenreiter' or 'make' (to build everything) | ||
37 | Note that you need to have libpcap in your toolchain. | ||
38 | |||
39 | (II) OpenZaurus Build Environment | ||
40 | |||
41 | See (I), but you must build a complete opie via 'make SUBDIRS=packages/opie' | ||
42 | 28 | ||
43 | (III) To compile a standalone Wellenreiter for X11, you need Qt3 and the development | 29 | * Set $QTDIR to the appropriate directory (e.g. /usr/lib/qt3) |
44 | packages for Qt3, e.g. libqt3-devel. Assuming, $QTDIR is set to your Qt-Director | 30 | * './build make' |
45 | (e.g. /usr/lib/qt3), set $OPIEDIR to the root of the checked out Opie, then | 31 | * as root, './build install' |
46 | 'export QMAKESPEC=$QTDIR/mkspecs/linux-g++' | 32 | * Wellenreiter will be installed in /usr/local |
47 | 'cd noncore/net/wellenreiter' | ||
48 | 'qmake "platform=x11" wellenreiter.pro' | ||
49 | 'make SUBDIRS=noncore/net/wellenreiter' | ||
50 | 'make install' | ||
51 | 33 | ||
52 | ===================== | 34 | ===================== |
53 | = Install | 35 | = Precompiled Binaries |
54 | ===================== | 36 | ===================== |
55 | 37 | ||
56 | Alternatively, you can use our precompiled ipk. Get it from | 38 | Precompiled binaries are available for the PDA-Version. |
57 | http://opie.net.wox.org/wellenreiter/ where you will also | 39 | Get them from http://opie.net.wox.org/wellenreiter/ |
58 | find all necessary dependencies. | ||
59 | 40 | ||
60 | ===================== | 41 | ===================== |
@@ -64,5 +45,5 @@ find all necessary dependencies. | |||
64 | * Configure your device by pressing the configure toolbutton (to the right) | 45 | * Configure your device by pressing the configure toolbutton (to the right) |
65 | * Start Sniffing by pressing the execute toolbutton which will be enabled, | 46 | * Start Sniffing by pressing the execute toolbutton which will be enabled, |
66 | if your device has been configured. | 47 | if your device has been properly configured. |
67 | 48 | ||
68 | ===================== | 49 | ===================== |
@@ -72,7 +53,7 @@ if your device has been configured. | |||
72 | Wellenreiter II is (C) 2002-2003 M-M-M | 53 | Wellenreiter II is (C) 2002-2003 M-M-M |
73 | 54 | ||
74 | Sniffer Engine: Max Moser <max@remote-exploit.org> | 55 | Max Moser <max@remote-exploit.org> |
75 | Communication and Protocol: Martin J. Muench <mjm@remote-exploit.org> | 56 | Martin J. Muench <mjm@remote-exploit.org> |
76 | GUI and Packaging: Michael Lauer <mickeyl@handhelds.org> | 57 | Michael Lauer <mickeyl@handhelds.org> |
77 | 58 | ||
78 | ===================== | 59 | ===================== |
@@ -80,7 +61,7 @@ GUI and Packaging: Michael Lauer <mickeyl@handhelds.org> | |||
80 | ===================== | 61 | ===================== |
81 | 62 | ||
82 | Opie Project: http://opie.handhelds.org | ||
83 | OpenZaurus Project: http://openzaurus.org | ||
84 | Wellenreiter: http://www.remote-exploit.org | 63 | Wellenreiter: http://www.remote-exploit.org |
85 | Wellenreiter/Opie: http://opie.net.wox.org/wellenreiter | 64 | Wellenreiter/Opie: http://opie.net.wox.org/wellenreiter |
65 | Opie Project: http://opie.handhelds.org | ||
66 | OpenZaurus Project: http://openzaurus.org | ||
86 | 67 | ||
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 @@ | |||
1 | ########################################## | ||
2 | # Wellenreiter X11 standalone build script # | ||
3 | ########################################## | ||
4 | |||
5 | PREFIX=/usr/local | ||
6 | |||
7 | # ------------------- do not change anything below | ||
8 | |||
9 | if [ -z $QTDIR ] | ||
10 | then | ||
11 | echo "*** ERROR: QTDIR is not set. QTDIR must point to your Qt directory, e.g. /usr/lib/qt3" | ||
12 | exit | ||
13 | fi | ||
14 | |||
15 | export QMAKESPEC=$QTDIR/mkspecs/linux-g++ | ||
16 | export OPIEDIR=$PWD | ||
17 | export PATH=$QTDIR/bin:$PATH | ||
18 | qmake "platform=x11" wellenreiter.pro | ||
19 | |||
20 | |||
21 | case "$1" in | ||
22 | compile) make;; | ||
23 | install) cp -dfR output/* $PREFIX/;; | ||
24 | *) echo "Usage: ./build [compile|install]"; exit;; | ||
25 | esac | ||
26 | |||
27 | |||
28 | |||
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 | |||
@@ -75,5 +75,5 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
75 | QPushButton* okButton = new QPushButton( "ok", this ); | 75 | QPushButton* okButton = new QPushButton( "ok", this ); |
76 | okButton->show(); | 76 | okButton->show(); |
77 | Layout5_2->addWidget( okButton ); //FIXME: rename this in configbase.ui | 77 | Layout5_2->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui |
78 | connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); | 78 | connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); |
79 | #endif | 79 | #endif |
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 | |||
@@ -36,7 +36,8 @@ TARGET = wellenreiter | |||
36 | 36 | ||
37 | contains( platform, x11 ) { | 37 | contains( platform, x11 ) { |
38 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lwellenreiter | 38 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter |
39 | SOURCES += resource.cpp | 39 | SOURCES += resource.cpp |
40 | HEADERS += resource.h | 40 | HEADERS += resource.h |
41 | DESTDIR = $(OPIEDIR)/output/bin | ||
41 | } | 42 | } |
42 | 43 | ||
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,5 +1,5 @@ | |||
1 | MOC_DIR = ./tmp | 1 | MOC_DIR = ./tmp |
2 | OBJECTS_DIR = ./tmp | 2 | OBJECTS_DIR = ./tmp |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/output/lib |
4 | TEMPLATE = lib | 4 | TEMPLATE = lib |
5 | CONFIG = qt warn_on debug | 5 | CONFIG = qt warn_on debug |
@@ -7,4 +7,5 @@ CONFIG = qt warn_on debug | |||
7 | HEADERS = $(OPIEDIR)/libopie2/opieui/olistview.h \ | 7 | HEADERS = $(OPIEDIR)/libopie2/opieui/olistview.h \ |
8 | $(OPIEDIR)/libopie2/opienet/onetutils.h \ | 8 | $(OPIEDIR)/libopie2/opienet/onetutils.h \ |
9 | $(OPIEDIR)/libopie2/opienet/omanufacturerdb.h \ | ||
9 | $(OPIEDIR)/libopie2/opienet/onetwork.h \ | 10 | $(OPIEDIR)/libopie2/opienet/onetwork.h \ |
10 | $(OPIEDIR)/libopie2/opienet/opcap.h | 11 | $(OPIEDIR)/libopie2/opienet/opcap.h |
@@ -12,4 +13,5 @@ HEADERS = $(OPIEDIR)/libopie2/opieui/olistview.h \ | |||
12 | SOURCES = $(OPIEDIR)/libopie2/opieui/olistview.cpp \ | 13 | SOURCES = $(OPIEDIR)/libopie2/opieui/olistview.cpp \ |
13 | $(OPIEDIR)/libopie2/opienet/onetutils.cpp \ | 14 | $(OPIEDIR)/libopie2/opienet/onetutils.cpp \ |
15 | $(OPIEDIR)/libopie2/opienet/omanufacturerdb.cpp \ | ||
14 | $(OPIEDIR)/libopie2/opienet/onetwork.cpp \ | 16 | $(OPIEDIR)/libopie2/opienet/onetwork.cpp \ |
15 | $(OPIEDIR)/libopie2/opienet/opcap.cpp | 17 | $(OPIEDIR)/libopie2/opienet/opcap.cpp |
@@ -17,12 +19,7 @@ SOURCES = $(OPIEDIR)/libopie2/opieui/olistview.cpp \ | |||
17 | INCLUDEPATH += $(OPIEDIR)/include | 19 | INCLUDEPATH += $(OPIEDIR)/include |
18 | DEPENDPATH += $(OPIEDIR)/include | 20 | DEPENDPATH += $(OPIEDIR)/include |
19 | LIBS = -lpcap | 21 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap |
20 | TARGET = wellenreiter | 22 | TARGET = wellenreiter |
21 | VERSION = 1.0.0 | 23 | VERSION = 1.0.0 |
22 | 24 | ||
23 | contains( platform, x11 ) { | ||
24 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
25 | SOURCES += resource.cpp | ||
26 | HEADERS += resource.h | ||
27 | } | ||
28 | 25 | ||
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 @@ | |||
1 | VERSION=2-alpha2 | ||
2 | |||
3 | TGZDIR=$PWD | ||
4 | |||
5 | # script to make a .tgz distributable for the Wellenreiter X11 Standalone Version | ||
6 | |||
7 | find . -name "*.o"|xargs rm -f | ||
8 | find . -name "Makefile"|xargs rm -f | ||
9 | find . -name "*moc*"|xargs rm -f | ||
10 | #TMPFILE=`mktemp -d -q /tmp/build.XXXXXX` | ||
11 | TMPFILE=/tmp/build | ||
12 | #if [ $? -ne 0 ]; then | ||
13 | # echo "$0: Can't create temp file, exiting..." | ||
14 | # exit 1 | ||
15 | #fi | ||
16 | |||
17 | TMPDIR=$TMPFILE/wellenreiter$VERSION | ||
18 | OUTPUT=$TMPDIR/output | ||
19 | |||
20 | mkdir -p $TMPDIR/libopie2/opieui | ||
21 | mkdir -p $TMPDIR/libopie2/opienet | ||
22 | mkdir -p $TMPDIR/include/opie2 | ||
23 | mkdir -p $OUTPUT/share/wellenreiter/pics | ||
24 | mkdir -p $OUTPUT/share/wellenreiter | ||
25 | cp -dfR gui $TMPDIR | ||
26 | cp -dfR lib $TMPDIR | ||
27 | cp -dfR build README wellenreiter.pro $TMPDIR | ||
28 | cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/ | ||
29 | cp -dfR $OPIEDIR/share/wellenreiter/* $OUTPUT/share/wellenreiter/ | ||
30 | |||
31 | # take care about sourcefiles | ||
32 | |||
33 | FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \ | ||
34 | libopie2/opienet/opcap.h libopie2/opienet/opcap.cpp libopie2/opienet/802_11_user.h \ | ||
35 | libopie2/opienet/onetutils.h libopie2/opienet/onetutils.cpp \ | ||
36 | libopie2/opienet/omanufacturerdb.h libopie2/opienet/omanufacturerdb.cpp \ | ||
37 | libopie2/opieui/olistview.cpp libopie2/opieui/olistview.h" | ||
38 | |||
39 | for i in $FILES | ||
40 | do cp -dfR $OPIEDIR/$i $TMPDIR/$i | ||
41 | done | ||
42 | |||
43 | # make includes | ||
44 | pushd $TMPDIR/include/opie2 | ||
45 | ln -sf ../../libopie2/opieui/*.h . | ||
46 | ln -sf ../../libopie2/opienet/*.h . | ||
47 | popd | ||
48 | |||
49 | find $TMPDIR -name "CVS"|xargs rm -rf | ||
50 | |||
51 | pushd $TMPFILE | ||
52 | tar czf $TGZDIR/wellenreiter$VERSION.tgz wellenreiter$VERSION | ||
53 | popd | ||
54 | |||