From 9b662f0bcde5405c31ce68cc1aa573ea3d24dfd4 Mon Sep 17 00:00:00 2001 From: Andrew Lewman Date: Mon, 9 Oct 2006 01:52:30 +0000 Subject: [PATCH] We have icons for Tor in Win32-land. svn:r8659 --- contrib/Makefile.am | 2 +- contrib/package_nsis-mingw.sh | 1 + contrib/tor-mingw.nsi.in | 9 ++++++--- contrib/tor.ico | Bin 0 -> 23558 bytes 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 contrib/tor.ico diff --git a/contrib/Makefile.am b/contrib/Makefile.am index d8ae4c06d6..32bc96dc57 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -3,7 +3,7 @@ DIST_SUBDIRS = osx suse confdir = $(sysconfdir)/tor -EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh +EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh conf_DATA = tor-tsocks.conf diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index 433c51cfeb..b38fcd71e4 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -22,6 +22,7 @@ cp src/or/tor.exe win_tmp/bin/ cp src/tools/tor-resolve.exe win_tmp/bin/ cp /usr/local/ssl/lib/libcrypto.a win_tmp/bin/ cp /usr/local/ssl/lib/libssl.a win_tmp/bin/ +cp contrib/tor.ico win_tmp/bin/ # There is no man2html in mingw. # Maybe we should add this into make dist instead. diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index bcadaeecd4..918a69a64f 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -24,6 +24,7 @@ Name "Tor" Caption "Tor ${VERSION} Setup" BrandingText "The Onion Router" CRCCheck on +XPStyle on ;Use upx on the installer header to shrink the size. !packhdr header.dat "upx --best header.dat" @@ -66,6 +67,7 @@ Section "Tor" Tor SetOutPath $INSTDIR File "${BIN}\tor.exe" File "${BIN}\tor-resolve.exe" + File "${BIN}\tor.ico" WriteIniStr "$INSTDIR\Tor Website.url" "InternetShortcut" "URL" ${WEBSITE} StrCpy $configfile "torrc" @@ -123,7 +125,7 @@ Section "Start Menu" StartMenu IfFileExists "$SMPROGRAMS\Tor\*.*" "" +2 RMDir /r "$SMPROGRAMS\Tor" CreateDirectory "$SMPROGRAMS\Tor" - CreateShortCut "$SMPROGRAMS\Tor\Tor.lnk" "$INSTDIR\tor.exe" + CreateShortCut "$SMPROGRAMS\Tor\Tor.lnk" "$INSTDIR\tor.exe" "" "$INSTDIR\tor.ico" CreateShortCut "$SMPROGRAMS\Tor\Torrc.lnk" "Notepad.exe" "$configdir\torrc" CreateShortCut "$SMPROGRAMS\Tor\Tor Website.lnk" "$INSTDIR\Tor Website.url" CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Uninstall.exe" @@ -137,12 +139,12 @@ SectionEnd Section "Desktop" Desktop SetOutPath $INSTDIR - CreateShortCut "$DESKTOP\Tor.lnk" "$INSTDIR\tor.exe" + CreateShortCut "$DESKTOP\Tor.lnk" "$INSTDIR\tor.exe" "" "$INSTDIR\tor.ico" SectionEnd Section /o "Run at startup" Startup SetOutPath $INSTDIR - CreateShortCut "$SMSTARTUP\Tor.lnk" "$INSTDIR\tor.exe" "" "" 0 SW_SHOWMINIMIZED + CreateShortCut "$SMSTARTUP\Tor.lnk" "$INSTDIR\tor.exe" "" "$INSTDIR\tor.ico" "" SW_SHOWMINIMIZED SectionEnd SubSectionEnd @@ -156,6 +158,7 @@ Section "Uninstall" Delete "$INSTDIR\Tor Website.url" Delete "$INSTDIR\torrc" Delete "$INSTDIR\torrc.sample" + Delete "$INSTDIR\tor.ico" StrCmp $configdir $INSTDIR +2 "" RMDir /r $configdir Delete "$INSTDIR\Uninstall.exe" diff --git a/contrib/tor.ico b/contrib/tor.ico new file mode 100644 index 0000000000000000000000000000000000000000..a69bab48f001d0f2f70602955d0412e137ce1f94 GIT binary patch literal 23558 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 R>7{PXK~)UBS?X3y{{!#BwEzGB literal 0 HcmV?d00001