Commit graph

30 commits

Author SHA1 Message Date
Pascal Quantin
9ce04cbb09 Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM environment variable is not explicitly set
Bug: 10317
Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723
Reviewed-on: https://code.wireshark.org/review/3203
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-28 18:32:24 +00:00
Joerg Mayer
7bc24eda07 Add back a 'dummy' comment I removed with commit e91121e143
Change-Id: Ia21dc80c8b942fbc1a85a8990354bdaaf9dc8210
Reviewed-on: https://code.wireshark.org/review/3161
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-22 16:20:20 +00:00
Joerg Mayer
c90b642fef Pass the download tag as an argument to win-setup.sh instead as an enviroment variable
Change-Id: Id2369cec93b82f182bab9046469796f51115accb
Reviewed-on: https://code.wireshark.org/review/3143
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 00:22:26 +00:00
Joerg Mayer
622f06b2c2 WIRESHARK_TARGET_PLATFORM is only used inside --download code path:
Use it only there.
Update comments wrt DOWNLOAD_PREFIX
Remove trailing / at end of DOWNLOAD_PREFIX

Change-Id: Ia161d4226ff3d463bceaaf4e01de70b2db98bf3c
Reviewed-on: https://code.wireshark.org/review/3142
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-20 23:40:08 +00:00
Joerg Mayer
e91121e143 Change a comment to be slightly easier to read
Reorder code to have all toplevel code in 'main'

Change-Id: Ia99830ce2ee6af46249f533d64a328d2da2ed9b8
Reviewed-on: https://code.wireshark.org/review/3141
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-20 22:33:08 +00:00
Alexis La Goutte
9fd19ddc09 Fix indent (use tabs)
Change-Id: I45f5e2ed64090947f1605db10eb6cee0e33782bf
Reviewed-on: https://code.wireshark.org/review/248
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18 13:51:37 +00:00
Jeff Morriss
82e2865739 Remove $Id$ and other Subversion leftovers from the tools.
There are a few things in here which could still use attention.

Don't regenerate anything now.

Change-Id: I283c224d3523212144707fca3d6265916cb11792
Reviewed-on: https://code.wireshark.org/review/205
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-14 01:35:57 +00:00
Pascal Quantin
3cd6045421 Get rid of "win-setup.sh: line 24: $'\r': command not found" warning
svn path=/trunk/; revision=50642
2013-07-15 22:02:12 +00:00
Jeff Morriss
f3b4e97bcc Add (GPLv2+) license headers to these scripts, assigning the copyright to
the original author of the scripts (Gerald).

svn path=/trunk/; revision=50542
2013-07-12 21:51:34 +00:00
Graham Bloice
e6e7c1181b From Orgad Shaneh via bug 8308 - allow a relative path for the WIRESHARK_LIBS location.
svn path=/trunk/; revision=50065
2013-06-19 23:06:14 +00:00
Gerald Combs
1b1a1e6a3e Remove our local copy of WinPcap and download it from
wireshark-win{32,64}-libs instead. In win-setup.sh only try to unzip
files ending in .zip. PortableApps and U3 packaging changes are untested.

svn path=/trunk/; revision=44888
2012-09-13 21:28:28 +00:00
Bill Meier
d59b7b4370 Add quotes around some filename usage; Also: use $() instead of backticks
svn path=/trunk/; revision=40396
2012-01-06 18:22:50 +00:00
Jaap Keuter
10ca01fb1b Allow for true error reporing.
Move the comment to where it's intended.

svn path=/trunk/; revision=40158
2011-12-12 07:56:45 +00:00
Gerald Combs
cd7da58daa Add "--windowsonly" and "--cygwinonly" options to win-setup.sh
--appverify.  Make sure "mt" is only found in a normaly Windows path and
"find" is only found in a Cygwin path.

svn path=/trunk/; revision=38781
2011-08-29 19:22:42 +00:00
Bill Meier
bec334b1c6 Fix: Cygwin make fails after updating to bash v 4.1.9.2
Extracts from the cygwin Bash 4.1.9.2 release announcement:

4a. For a single affected script, add this line just after the she-bang:
 (set -o igncr) 2>/dev/null && set -o igncr; # comment is needed

4e. bash-4.1.9-1 dropped support for 'shopt -s igncr';

I'm assuming this is backwards compatible; If not, we'll know quite shortly :) 


svn path=/trunk/; revision=35788
2011-02-03 19:33:48 +00:00
Bill Meier
cc70d90bb0 (Trivial) Fix a typo.
svn path=/trunk/; revision=35652
2011-01-26 00:15:01 +00:00
Stephen Fisher
7b35e1195c Stop the MS-DOS style path name warnings when compiling on Windows.
svn path=/trunk/; revision=34375
2010-10-04 22:00:50 +00:00
Bill Meier
412fc3d5c5 From Chris Maynard: Fix Bug #1292: "Win32: confusing setup target warning if cl.exe is not in path"
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1292

svn path=/trunk/; revision=32614
2010-04-30 20:15:27 +00:00
Guy Harris
7712d64f42 At least part of the problem is that Bash's test command appears not to
do short-circuit evaluation, so you can't do

	if [ {test 1} -a {test that's not safe if test1 is false} ]
	then
		...
	fi

so don't do that.

svn path=/trunk/; revision=31894
2010-02-16 01:08:07 +00:00
Guy Harris
ebe8dc121e Close quote.
svn path=/trunk/; revision=31893
2010-02-16 00:41:06 +00:00
Guy Harris
915f1482db More debug crap.
svn path=/trunk/; revision=31892
2010-02-16 00:00:50 +00:00
Guy Harris
0023958937 More debugging - stripping out the newlines didn't suffice.
svn path=/trunk/; revision=31891
2010-02-15 23:47:05 +00:00
Guy Harris
cc1e71a2ac The problem was that if you do, for example:
foo=`echo`

$foo won't be empty, it'll include the newline at the end of the output
of "echo".  The same applies for any other command; strip newlines from
the output of regtool to avoid that problem.

svn path=/trunk/; revision=31889
2010-02-15 23:26:43 +00:00
Guy Harris
f3e871e659 Eh? It looks blank, but "-n" should catch that. Hopefully we have "od"
and that'll let us see the raw bytes.

svn path=/trunk/; revision=31888
2010-02-15 23:05:04 +00:00
Guy Harris
e5fc4b7b4c Add a debugging printout. (What I found in the Intertubes seems to
indicate that ProxyEnabled is an integral value; if it's not a null
string, and if it's not an integral value, what is it?)

svn path=/trunk/; revision=31887
2010-02-15 22:48:51 +00:00
Guy Harris
2a5b733207 Protect against $proxy_enabled being empty.
svn path=/trunk/; revision=31886
2010-02-15 22:31:21 +00:00
Bill Meier
66650422de For now: Add hack so \r ignored when win-setup.sh is invoked from a cygwin bash shell.
See: http://www.mail-archive.com/cygwin-announce@cygwin.com/msg01711.html

Note: another way to do this (as described in the above) might be to
"export the environment variable SHELLOPTS with igncr included in it.
It is read-only from within bash, but you can set it before invoking bash; 
once in bash, it auto-tracks the current state of 'set -o igncr' 
or 'shopt -s igncr'.  If exported, then all bash child processes inherit
the same option settings".


svn path=/trunk/; revision=31538
2010-01-15 21:09:54 +00:00
Gerald Combs
b5924db6b8 Set some properties.
svn path=/trunk/; revision=31528
2010-01-14 19:48:50 +00:00
Anders Broman
65a85f0fba Use gtk+-bundle_2.16.6-20091215_win32
svn path=/trunk/; revision=31285
2009-12-16 20:54:40 +00:00
Kovarththanan Rajaratnam
3a56072656 Add win-setup.sh which contains pretty much what used to be in win32-setup.sh and which happens to be generic code
svn path=/trunk/; revision=30130
2009-09-24 20:52:58 +00:00