aboutsummaryrefslogtreecommitdiffstats
path: root/vagrant_build.sh
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2015-06-25 08:17:23 -0700
committerEvan Huus <eapache@gmail.com>2015-06-25 15:24:06 +0000
commit47abcfc74721ea8bac35dbb877db615081720cff (patch)
tree63e4f11ca9d4df013b477b07932aefeb6e030540 /vagrant_build.sh
parent92c8c3a3bda8fe04f27d3c022129b9472e86b011 (diff)
Vagrant setup fixes
- add license headers to the scripts - don't mount `.` into the VM manually, vagrant already puts it in /vagrant/ for us, just use that. - build with -j3, slightly more efficient even with two cores Change-Id: I43580ade7ae2635696072b39e4f18a401a030a85 Reviewed-on: https://code.wireshark.org/review/9127 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'vagrant_build.sh')
-rw-r--r--vagrant_build.sh25
1 files changed, 23 insertions, 2 deletions
diff --git a/vagrant_build.sh b/vagrant_build.sh
index 648ed3451b..6272003f80 100644
--- a/vagrant_build.sh
+++ b/vagrant_build.sh
@@ -1,7 +1,28 @@
#!/bin/bash
+#
+# Copyright 2015 Evan Huus <eapache@gmail.com>
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
set -e
mkdir -p build
cd build
-cmake /wireshark/
-make -j2
+cmake /vagrant/
+make -j3