From 6de434d3af54555bc53b93cca6f99de773142c37 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Sun, 17 Mar 2013 00:41:39 +0100 Subject: nacl scripts: include common header and rename build_nacl.sh Add a uniform header comment to the two scripts as present in other scripts in this repository as well. Also rename build_nacl.sh into nacl_build.sh to stay conform in naming. For this, also update all mentions of build_nacl.sh to nacl_build.sh. Signed-off-by: Daniel Borkmann --- INSTALL | 6 +++--- Makefile | 2 +- curvetun/.gitignore | 2 +- curvetun/build_nacl.sh | 46 --------------------------------------------- curvetun/nacl_build.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ curvetun/nacl_path.sh | 14 +++++++++----- 6 files changed, 65 insertions(+), 56 deletions(-) delete mode 100755 curvetun/build_nacl.sh create mode 100755 curvetun/nacl_build.sh diff --git a/INSTALL b/INSTALL index 74fc8e4..e8b2b0f 100644 --- a/INSTALL +++ b/INSTALL @@ -87,11 +87,11 @@ the tunneling software and the NaCl build process lasts quite long): (# make mrproper) In order to build curvetun, libnacl must be built first. A helper script -called build_nacl.sh is there to facilitate this process. If you want to +called nacl_build.sh is there to facilitate this process. If you want to build NaCl in the directory ~/nacl, the script should be called this way: $ cd curvetun - $ ./build_nacl.sh ~/nacl + $ ./nacl_build.sh ~/nacl There's also an abbreviation for this by simply typing: @@ -100,7 +100,7 @@ There's also an abbreviation for this by simply typing: This gives an initial output such as "Building NaCl for arch amd64 on host fuuubar (grab a coffee, this takes a while) ...". If the automatically detected architecture (such as amd64) is not the one you intend to compile -for, then edit the (cc="gcc") variable within the build_nacl.sh script to +for, then edit the (cc="gcc") variable within the nacl_build.sh script to your cross compiler. Yes, we know, the build system of NaCl is a bit of a pain, so you might check for a pre-built package from your distribution in case you are not cross compiling. diff --git a/Makefile b/Makefile index 4591806..2781c00 100644 --- a/Makefile +++ b/Makefile @@ -254,7 +254,7 @@ $(TOOLS): nacl: $(Q)echo "$(bold)$(WHAT) $@:$(normal)" - $(Q)cd curvetun/ && ./build_nacl.sh ~/nacl + $(Q)cd curvetun/ && ./nacl_build.sh ~/nacl $(Q)source ~/.bashrc tarball.gz: ; $(call GIT_ARCHIVE,gzip,gz) diff --git a/curvetun/.gitignore b/curvetun/.gitignore index d834aa2..ad9d744 100644 --- a/curvetun/.gitignore +++ b/curvetun/.gitignore @@ -3,5 +3,5 @@ !.gitignore !Makefile !abiname.c -!build_nacl.sh +!nacl_build.sh !nacl_path.sh diff --git a/curvetun/build_nacl.sh b/curvetun/build_nacl.sh deleted file mode 100755 index 7a97302..0000000 --- a/curvetun/build_nacl.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# netsniff-ng - the packet sniffing beast -# By Emmanuel Roullit -# Copyright 2009, 2011 Emmanuel Roullit. -# Subject to the GPL, version 2. - -cc="gcc" -nacl_dir="/tmp" -nacl_version="nacl-20110221" -nacl_suffix="tar.bz2" -nacl_base_url="http://hyperelliptic.org/nacl" -nacl_path="$nacl_dir/$nacl_version.$nacl_suffix" -nacl_build_dir="$1" - -if test -z "$nacl_build_dir"; then - echo "Please input the path where NaCl should be build" - exit 1 -fi - -if ! test -d "$nacl_build_dir"; then - mkdir "$nacl_build_dir" -fi - -wget -O "$nacl_path" "$nacl_base_url/$nacl_version.$nacl_suffix" -tar xjf "$nacl_path" -C "$nacl_build_dir" - -$cc -Wall -O2 ./abiname.c -o ./abiname -arch="`./abiname`" -shorthostname=$(hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]') - -echo "Building NaCl for arch $arch on host $shorthostname (grab a coffee, this takes a while) ..." - -cd "$nacl_build_dir"/"$nacl_version" -./do -cd - > /dev/null - -nacl_lib_path="$nacl_build_dir/$nacl_version/build/$shorthostname/lib/$arch" -nacl_include_path="$nacl_build_dir/$nacl_version/build/$shorthostname/include/$arch" - -echo "NaCl lib path $nacl_lib_path" -echo "NaCl include path $nacl_include_path" - -./nacl_path.sh "$nacl_include_path" "$nacl_lib_path" - -echo "Done!" diff --git a/curvetun/nacl_build.sh b/curvetun/nacl_build.sh new file mode 100755 index 0000000..df6027a --- /dev/null +++ b/curvetun/nacl_build.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# -*- coding: utf-8 -*- +# +# nacl_build.sh -- NaCl library build script +# +# Copyright (C) 2011 Daniel Borkmann +# Copyright (C) 2009-2011 Emmanuel Roullit +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. + +cc="gcc" +nacl_dir="/tmp" +nacl_version="nacl-20110221" +nacl_suffix="tar.bz2" +nacl_base_url="http://hyperelliptic.org/nacl" +nacl_path="$nacl_dir/$nacl_version.$nacl_suffix" +nacl_build_dir="$1" + +if test -z "$nacl_build_dir"; then + echo "Please input the path where NaCl should be build" + exit 1 +fi + +if ! test -d "$nacl_build_dir"; then + mkdir "$nacl_build_dir" +fi + +wget -O "$nacl_path" "$nacl_base_url/$nacl_version.$nacl_suffix" +tar xjf "$nacl_path" -C "$nacl_build_dir" + +$cc -Wall -O2 ./abiname.c -o ./abiname +arch="`./abiname`" +shorthostname=$(hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]') + +echo "Building NaCl for arch $arch on host $shorthostname (grab a coffee, this takes a while) ..." + +cd "$nacl_build_dir"/"$nacl_version" +./do +cd - > /dev/null + +nacl_lib_path="$nacl_build_dir/$nacl_version/build/$shorthostname/lib/$arch" +nacl_include_path="$nacl_build_dir/$nacl_version/build/$shorthostname/include/$arch" + +echo "NaCl lib path $nacl_lib_path" +echo "NaCl include path $nacl_include_path" + +./nacl_path.sh "$nacl_include_path" "$nacl_lib_path" + +echo "Done!" diff --git a/curvetun/nacl_path.sh b/curvetun/nacl_path.sh index 1afc6d2..9f492ba 100755 --- a/curvetun/nacl_path.sh +++ b/curvetun/nacl_path.sh @@ -1,9 +1,13 @@ #!/bin/bash - -# netsniff-ng - the packet sniffing beast -# By Emmanuel Roullit -# Copyright 2009, 2011 Emmanuel Roullit. -# Subject to the GPL, version 2. +# -*- coding: utf-8 -*- +# +# nacl_path.sh -- NaCl path export script +# +# Copyright (C) 2009-2011 Emmanuel Roullit +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. nacl_include_path="$1" nacl_lib_path="$2" -- cgit v1.2.3-54-g00ecf