From 3132c9b593a6664b2ba3a26c8b8f2b94330cc607 Mon Sep 17 00:00:00 2001 From: david-sarah Date: Sat, 25 Dec 2010 20:02:37 -0800 Subject: [PATCH] Remove unmaintained Windows GUI app, except for windows/tahoesvc.py which is moved to src/allmydata/windows. refs #1282 --- Makefile | 13 --- .../allmydata/windows}/tahoesvc.py | 0 windows/Makefile | 25 ------ windows/amdicon.ico | Bin 19118 -> 0 bytes windows/confwiz.py | 6 -- windows/depends.py | 16 ---- windows/installer.bmp | Bin 11720 -> 0 bytes windows/installer.ico | Bin 33982 -> 0 bytes windows/installer.tmpl | 72 --------------- windows/setup.py | 82 ------------------ windows/tahoe.py | 9 -- 11 files changed, 223 deletions(-) rename {windows => src/allmydata/windows}/tahoesvc.py (100%) delete mode 100644 windows/Makefile delete mode 100644 windows/amdicon.ico delete mode 100644 windows/confwiz.py delete mode 100644 windows/depends.py delete mode 100644 windows/installer.bmp delete mode 100644 windows/installer.ico delete mode 100644 windows/installer.tmpl delete mode 100644 windows/setup.py delete mode 100644 windows/tahoe.py diff --git a/Makefile b/Makefile index 9d1f02a0b..c02b81a44 100644 --- a/Makefile +++ b/Makefile @@ -416,16 +416,3 @@ deb-jaunty-head: .PHONY: EXPERIMENTAL-deb EXPERIMENTAL-deb: is-known-debian-arch $(PYTHON) misc/build_helpers/build-deb.py $(ARCH) - - -# These targets provide for windows native builds -.PHONY: windows-exe windows-installer windows-installer-upload - -windows-exe: .built - $(RUNPP) -c "$(MAKE) -C windows windows-exe" - -windows-installer: - $(RUNPP) -c "$(MAKE) -C windows windows-installer" - -windows-installer-upload: - $(RUNPP) -c "$(MAKE) -C windows windows-installer-upload" diff --git a/windows/tahoesvc.py b/src/allmydata/windows/tahoesvc.py similarity index 100% rename from windows/tahoesvc.py rename to src/allmydata/windows/tahoesvc.py diff --git a/windows/Makefile b/windows/Makefile deleted file mode 100644 index 761199c6d..000000000 --- a/windows/Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -# we get $(PYTHON) from our parent, do 'make windows-exe PYTHON=foo' to -# control it, since 'PYTHON=foo make windows-exe' doesn't seem to override -# the default. - -# We also get $(PYTHONPATH) from our parent, which is critical for py2exe to -# find the tahoe code. Invoking this Makefile directly won't work. - -INNOSETUP := $(shell cygpath -au "$(PROGRAMFILES)/Inno Setup 5/Compil32.exe") - -.PHONY: windows-exe windows-installer windows-installer-upload - -windows-exe.stamp: - $(PYTHON) setup.py py2exe - touch windows-exe.stamp -windows-exe: windows-exe.stamp - -windows-installer: windows-exe.stamp - $(PYTHON) ../misc/sub-ver.py installer.tmpl >installer.iss - "$(INNOSETUP)" /cc installer.iss - -windows-installer-upload: - chmod -R o+rx dist/installer - rsync -av -e /usr/bin/ssh dist/installer/ amduser@dev:/home/amduser/public_html/dist/tahoe/windows/ - diff --git a/windows/amdicon.ico b/windows/amdicon.ico deleted file mode 100644 index 616240ad147670bd8d0cc194fe343dccc115872e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19118 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 Oi!S$y>PdhRQ~wV(-`d{* diff --git a/windows/confwiz.py b/windows/confwiz.py deleted file mode 100644 index 3a88caff6..000000000 --- a/windows/confwiz.py +++ /dev/null @@ -1,6 +0,0 @@ -import sys -from allmydata.gui.confwiz import main - -if __name__ == '__main__': -# main(sys.argv, open_welcome_page=False) - main(sys.argv) diff --git a/windows/depends.py b/windows/depends.py deleted file mode 100644 index 97e82d979..000000000 --- a/windows/depends.py +++ /dev/null @@ -1,16 +0,0 @@ - -# nevow requires all these for its voodoo module import time adaptor registrations -from nevow import accessors, appserver, static, rend, url, util, query, i18n, flat -from nevow import guard, stan, testutil, context -from nevow.flat import flatmdom, flatstan, twist -from formless import webform, processors, annotate, iformless -from decimal import Decimal - -import allmydata.web - -# junk to appease pyflakes's outrage at py2exe's needs -junk = [ - accessors, appserver, static, rend, url, util, query, i18n, flat, guard, stan, testutil, - context, flatmdom, flatstan, twist, webform, processors, annotate, iformless, Decimal, - allmydata, - ] diff --git a/windows/installer.bmp b/windows/installer.bmp deleted file mode 100644 index 2e7c24ed7b50eb08dbeb310883132258ea4144da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11720 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 b8t~MByKCUipWk54G|zwVJjdbhJjdaG2u_m| diff --git a/windows/installer.tmpl b/windows/installer.tmpl deleted file mode 100644 index 6721ed996..000000000 --- a/windows/installer.tmpl +++ /dev/null @@ -1,72 +0,0 @@ -[Setup] -AppName=Allmydata 3.0.4 -; AppVerName=Allmydata 3.0.4 (build %(major)d.%(minor)d.%(point)d-r%(revision)d) -AppVerName=Allmydata 3.0.4 -AppVersion=%(major)d.%(minor)d.%(point)d-r%(revision)d -VersionInfoVersion=%(major)d.%(minor)d.%(point)d.%(revision)d -AppPublisher=Allmydata Inc. -AppCopyright=Copyright (c) 2004-2008 Allmydata, Inc. -AppPublisherURL=http://www.allmydata.com/ -AppSupportURL=http://support.allmydata.com/ -WizardSmallImageFile=../installer.bmp -DefaultDirName={pf}\Allmydata 3.0 -DefaultGroupName=Allmydata 3.0 -; minumum version NT 4, no classic windows -MinVersion=0,4.0 -Compression=lzma/max -SolidCompression=yes -OutputDir=./installer/ -SourceDir=dist -SetupIconFile=../installer.ico -UninstallDisplayIcon=../amdicon.ico -; license file needs to be build/all dir -;LicenseFile=../license.txt -OutputBaseFilename=Allmydata_Tahoe_Setup_v%(major)d_%(minor)d_%(point)d_r%(revision)d - -[Files] -; contents of 'binaries' dir. (consolidated build target) -Source: "*.*"; DestDir: "{app}\Install"; Flags: restartreplace replacesameversion uninsrestartdelete -Source: ".\pkg_resources\*.*"; DestDir: "{app}\Install\pkg_resources"; Flags: recursesubdirs -Source: ".\winfuse\*.*"; DestDir: "{app}\Install\winfuse"; Flags: recursesubdirs - -[Dirs] -Name: "{app}\noderoot" - -[Icons] -; Program files entries -Name: "{group}\Allmydata"; Filename: "{app}\Install\winfuse\AllmydataTray.exe" -Name: "{commonstartup}\Allmydata"; Filename: "{app}\Install\winfuse\AllmydataTray.exe" -;Name: "{group}\Tahoe root dir (web)"; Filename: "{app}\Install\tahoe.exe"; Parameters: "webopen" -Name: "{group}\Allmydata Help"; Filename: "http://www.allmydata.com/help" - -[Run] -; Things performed before the final page of the installer -Filename: "{sys}\net.exe"; Parameters: "stop ""Allmydata SMB"""; Flags: runhidden -Filename: "{sys}\net.exe"; Parameters: "stop Tahoe"; Flags: runhidden -Filename: "{sys}\net.exe"; Parameters: "stop Allmydata Manager"; Flags: runhidden -Filename: "{app}\Install\tahoesvc.exe"; Parameters: "-install -auto"; Flags: runhidden -Filename: "{app}\Install\tahoe.exe"; Parameters: "create-node ""{app}\noderoot"""; Flags: runhidden -Filename: "{app}\Install\winfuse\AllmydataManager.exe"; Parameters: "-install -auto"; Flags: runhidden -Filename: "{app}\Install\winfuse\InstallUtil.exe"; Parameters: """{app}\Install\winfuse\WinFUSE.exe"""; Flags: runhidden -Filename: "{app}\Install\confwiz.exe"; Flags: hidewizard -;Filename: "{app}\Install\ReadMe.txt"; Description: "View the ReadMe file"; Flags: unchecked postinstall nowait shellexec skipifdoesntexist -Filename: "{sys}\rundll32.exe"; Parameters: "{app}\Install\winfuse\loopback_install.dll doLoopBackEntry"; Flags: runhidden -Filename: "{app}\Install\winfuse\AllmydataTray.exe"; Description: "Run Allmydata"; Flags: postinstall nowait -Filename: "http://www.allmydata.com/welcome_install?v=%(major)d.%(minor)d.%(point)d.%(revision)d"; Description: "View the Welcome Page"; Flags: postinstall shellexec -Filename: "{sys}\net.exe"; Parameters: "start ""Allmydata Manager"""; Flags: runhidden - -[UninstallRun] -; Performed before the uninstaller runs to undo things -; xFilename: "{app}\Install\winfuse\AllmydataTray.exe"; Parameters: "-Q"; Flags: runhidden -Filename: "{sys}\net.exe"; Parameters: "stop ""Allmydata SMB"""; Flags: runhidden -Filename: "{sys}\net.exe"; Parameters: "stop Tahoe"; Flags: runhidden -Filename: "{sys}\net.exe"; Parameters: "stop ""Allmydata Manager"""; Flags: runhidden -Filename: "{app}\Install\winfuse\InstallUtil.exe"; Parameters: "/uninstall ""{app}\Install\winfuse\WinFUSE.exe"""; Flags: runhidden -Filename: "{app}\Install\tahoesvc.exe"; Parameters: "-remove"; Flags: runhidden -Filename: "{app}\Install\winfuse\AllmydataManager.exe"; Parameters: "-U"; Flags: runhidden -;Filename: "{app}\Install\confwiz.exe"; Parameters: "--uninstall"; Flags: runhidden -;Filename: "http://www.allmydata.com/redirect/uninstallsurvey.php?build=%(build)s"; Flags: shellexec - -[Registry] -Root: HKLM; Subkey: "Software\Allmydata"; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: "Software\Allmydata"; ValueType: string; ValueName: "Base Dir Path"; ValueData: "{app}\noderoot"; Flags: uninsdeletekey diff --git a/windows/setup.py b/windows/setup.py deleted file mode 100644 index 62e5e71e8..000000000 --- a/windows/setup.py +++ /dev/null @@ -1,82 +0,0 @@ -from distutils.core import setup -import py2exe - -import glob - -lnf_manifest = """ - - - -%s - - - - - - -""" - -packages = ['encodings'] - -try: - import _xmlplus -except ImportError: - pass -else: - packages.append('_xmlplus') - -setup_args = { - 'name': 'Tahoe', - 'description': 'Allmydata Tahoe distributated storage', - 'author': 'Allmydata, Inc.', - 'windows': [ - { - 'script': 'confwiz.py', - 'icon_resources': [(1, 'amdicon.ico')], - 'other_resources': [(24,1,lnf_manifest%'Allmydata Tahoe Config Wizard')], - }, - ], - 'console': [ - 'tahoe.py', - ], - 'service': [ - 'tahoesvc', - ], - 'data_files': [ - ('.', [ - ],), - ('pkg_resources/allmydata/web', glob.glob('../src/allmydata/web/*')), - ('winfuse', glob.glob('./winfuse/*')), - ], - 'zipfile' : 'library.zip', - 'options': { - "py2exe": { - "excludes": [ - ], - "includes": [ - ], - "packages": packages, - #"optimize" : 2, - }, - }, -} - -if __name__ == '__main__': - setup(**setup_args) - - -_junk = py2exe # appease pyflakes -del _junk diff --git a/windows/tahoe.py b/windows/tahoe.py deleted file mode 100644 index e3e4b469a..000000000 --- a/windows/tahoe.py +++ /dev/null @@ -1,9 +0,0 @@ -from allmydata.util import pkgresutil # override the pkg_resources zip provider for py2exe deployment -pkgresutil.install() # this is done before nevow is imported by depends -import depends # import dependencies so that py2exe finds them -_junk = depends # appease pyflakes - -import sys -from allmydata.scripts import runner - -sys.exit(runner(install_node_control=False)) \ No newline at end of file