From 25a99ca0d26327393c3feeb28855dcc18c0373e4 Mon Sep 17 00:00:00 2001
From: stubbfel <dev@stubbfel>
Date: Mon, 23 Nov 2015 22:47:15 +0100
Subject: [PATCH] finish package creation

---
 build.sh                      | 10 +++++-----
 dist/package/PKGBUILD         | 36 +++++++++++++++++++++++++++--------
 dist/package/createpackage.sh | 17 +++++++++++++++++
 lib/buildjsoncpp.sh           |  2 +-
 4 files changed, 51 insertions(+), 14 deletions(-)
 create mode 100644 dist/package/createpackage.sh

diff --git a/build.sh b/build.sh
index bf44515..aea8c88 100644
--- a/build.sh
+++ b/build.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 cd lib
-#sh buildalllibs.sh
+sh buildalllibs.sh
 cd ..
-mkdir -p build/121Nat
-cd build/121Nat
+mkdir -p build/121Natbuild
+cd build/121Natbuild
 cmake ../../
 make
-cp 121Nat ../
+cp src/121Nat ../
 cd ../..
-rm -Rf build/121Nat
+rm -Rf build/121Natbuild
diff --git a/dist/package/PKGBUILD b/dist/package/PKGBUILD
index 033dca0..39b7d31 100644
--- a/dist/package/PKGBUILD
+++ b/dist/package/PKGBUILD
@@ -11,16 +11,36 @@ source=(./$pkgname-$pkgver.tar.gz)
 md5sums=('0e1494ebbcf0b0ca1bfa8475c5078f21')
 
 build() {
-  cd $srcdir/$pkgname
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ../
+  cd "${srcdir}/${pkgname}"
+  cd lib
+  mkdir -p bin
+  mkdir -p build/jsoncpp/
+  cd  build/jsoncpp/
+  cmake ../../src/jsoncpp -DCMAKE_INSTALL_PREFIX=/usr
   make
+  cp src/lib_json/libjsoncpp.a ../../bin 
+  cd ../..
+  mkdir -p build/libtins/
+  cd  build/libtins/
+  cmake ../../src/libtins -DLIBTINS_BUILD_SHARED=1 -DLIBTINS_ENABLE_CXX11=1 -DLIBTINS_ENABLE_WPA2=0 -DLIBTINS_ENABLE_DOT11=0 -DHAVE_PCAP_IMMEDIATE_MODE=1 -DCMAKE_INSTALL_PREFIX=/usr
+  make
+  cp lib/libtins.so ../../bin 
+  cd ../../..
+  mkdir -p build/121Natbuild
+  cd build/121Natbuild
+  cmake ../../ -DCMAKE_INSTALL_PREFIX=/usr
+  make
+  cp src/121Nat ../
 }
 
 package() {
-  cd $srcdir/$pkgname/build
-  make DESTDIR=$pkgdir install
-  mkdir -p $pkgdir/etc/$pkgname
-  cp ../src/config.json $pkgdir/etc/$pkgname/config-example.json
+  cd ${srcdir}/${pkgname}/lib/build/jsoncpp
+  make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}/lib/build/libtins"
+  make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}/build/121Natbuild"
+  make DESTDIR="${pkgdir}" install
+  mkdir -p "${pkgdir}/etc/${pkgname}"
+  cp "../../src/config.json" "${pkgdir}/etc/${pkgname}/config-example.json"
+  rm -R "${pkgdir}/usr/CMake"
 }
diff --git a/dist/package/createpackage.sh b/dist/package/createpackage.sh
new file mode 100644
index 0000000..62f3b28
--- /dev/null
+++ b/dist/package/createpackage.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+mkdir -p  temp/121Nat/lib
+
+cp -R ../../src/ temp/121Nat/
+cp -R ../../lib/src/ temp/121Nat/lib/
+cp ../../lib/*.sh temp/121Nat/lib/
+cp ../../build.sh temp/121Nat/
+cp ../../CMakeLists.txt temp/121Nat/
+cp PKGBUILD temp/
+
+cd temp
+tar -cvzf 121Nat-1.0.tar.gz 121Nat/
+md5=($(md5sum 121Nat-1.0.tar.gz))
+echo "md5sums=('$md5')" >> PKGBUILD
+makepkg
+cp temp/*.pkg.tar.xz .
+rm -Rf temp/121Nat/
diff --git a/lib/buildjsoncpp.sh b/lib/buildjsoncpp.sh
index fb9d162..34dfa7c 100644
--- a/lib/buildjsoncpp.sh
+++ b/lib/buildjsoncpp.sh
@@ -2,7 +2,7 @@
 mkdir -p bin
 mkdir -p build/jsoncpp/
 cd  build/jsoncpp/
-cmake ../../src/jsoncpp 
+cmake ../../src/jsoncpp
 make
 cp src/lib_json/libjsoncpp.a ../../bin 
 cd ../..