From 49ef352ea97bdd830d778f7943aac8e78a46d598 Mon Sep 17 00:00:00 2001 From: gen2brain Date: Wed, 5 Jun 2013 18:51:26 +0200 Subject: [PATCH] tag 0.1.4 --- ChangeLog | 7 ++ MANIFEST.in | 4 +- dist/debian/build.sh | 6 ++ dist/debian/changelog | 9 +++ ...{m64py-0.1.0.ebuild => m64py-0.1.4.ebuild} | 0 dist/redhat/build.sh | 7 ++ dist/redhat/{m64py.spec => m64py.spec.in} | 4 +- dist/windows/build.bat | 1 + dist/windows/m64py.iss | 16 ++++- dist/windows/m64py.iss.in | 72 +++++++++++++++++++ dist/windows/m64py.spec | 31 ++++---- dist/windows/version.sh | 3 + src/m64py/core/defs.py | 6 +- 13 files changed, 142 insertions(+), 24 deletions(-) create mode 100755 dist/debian/build.sh rename dist/gentoo/{m64py-0.1.0.ebuild => m64py-0.1.4.ebuild} (100%) create mode 100755 dist/redhat/build.sh rename dist/redhat/{m64py.spec => m64py.spec.in} (92%) create mode 100644 dist/windows/build.bat create mode 100644 dist/windows/m64py.iss.in create mode 100755 dist/windows/version.sh diff --git a/ChangeLog b/ChangeLog index 80135fe..ac2947e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +v0.1.4 Jun 05, 2013: + + * window resizing (needs Mupen64Plus v2.0-rc2) + * switched to PyQt API ver2 + * support multiple files in archives + * icons used are now from Tango! project + v0.1.0 Jun 23, 2012: * First public release diff --git a/MANIFEST.in b/MANIFEST.in index 4c37c1b..3dfb3d6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include setup.py m64py AUTHORS README ChangeLog COPYING LICENSES -recursive-include src/ *.py *.ui -recursive-include xdg/ *.desktop *.png *.xml +recursive-include src *.py *.ui +recursive-include xdg *.desktop *.png *.xml diff --git a/dist/debian/build.sh b/dist/debian/build.sh new file mode 100755 index 0000000..a885e82 --- /dev/null +++ b/dist/debian/build.sh @@ -0,0 +1,6 @@ +#!/bin/sh +apt-get -y install build-essential debhelper +cp -fr ../debian/ ../../ +cd ../../ +dpkg-buildpackage -rfakeroot +rm -rf build/ debian/ diff --git a/dist/debian/changelog b/dist/debian/changelog index 7d39ad1..25a1df1 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,3 +1,12 @@ +m64py (0.1.4-1) unstable; urgency=low + + * window resizing (needs Mupen64Plus v2.0-rc2) + * switched to PyQt API ver2 + * support multiple files in archives + * icons used are now from Tango! project + + -- Milan Nikolic Wed, 05 Jun 2013 10:37:37 +0200 + m64py (0.1.0-2) unstable; urgency=low * Add python-qt4-gl dependency diff --git a/dist/gentoo/m64py-0.1.0.ebuild b/dist/gentoo/m64py-0.1.4.ebuild similarity index 100% rename from dist/gentoo/m64py-0.1.0.ebuild rename to dist/gentoo/m64py-0.1.4.ebuild diff --git a/dist/redhat/build.sh b/dist/redhat/build.sh new file mode 100755 index 0000000..76c310e --- /dev/null +++ b/dist/redhat/build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +VERSION=`cat ../../src/m64py/core/defs.py | grep FRONTEND_VERSION | awk -F' = ' '{print $2}' | tr -d '"'` +sed "s/{VERSION}/$VERSION/g" m64py.spec.in > m64py.spec +cd ../../ && python setup.py sdist +mkdir -p ~/rpmbuild/SOURCES +cp dist/m64py-${VERSION}.tar.gz ~/rpmbuild/SOURCES/ +rpmbuild -ba dist/redhat/m64py.spec diff --git a/dist/redhat/m64py.spec b/dist/redhat/m64py.spec.in similarity index 92% rename from dist/redhat/m64py.spec rename to dist/redhat/m64py.spec.in index d2a9da3..c7526ad 100644 --- a/dist/redhat/m64py.spec +++ b/dist/redhat/m64py.spec.in @@ -1,6 +1,6 @@ %define name m64py -%define version 0.1.1 -%define unmangled_version 0.1.1 +%define version {VERSION} +%define unmangled_version {VERSION} %define release 1 Summary: M64Py - A frontend for Mupen64Plus diff --git a/dist/windows/build.bat b/dist/windows/build.bat new file mode 100644 index 0000000..2a8ce22 --- /dev/null +++ b/dist/windows/build.bat @@ -0,0 +1 @@ +c:\Python27\python.exe c:\m64py\pyinstaller\pyinstaller.py c:\m64py\dist\windows\m64py.spec diff --git a/dist/windows/m64py.iss b/dist/windows/m64py.iss index 715ed76..f26c9c8 100644 --- a/dist/windows/m64py.iss +++ b/dist/windows/m64py.iss @@ -1,7 +1,7 @@ [Setup] AppName=M64Py -AppVerName=M64Py 0.1.1 -VersionInfoVersion=0.1.1 +AppVerName=M64Py 0.1.4 +VersionInfoVersion=0.1.4 AppPublisher= AppPublisherURL=http://m64py.sourceforge.net/ AppSupportURL= @@ -13,7 +13,7 @@ OutputDir=. Uninstallable=yes WindowVisible=no AppCopyright=Author: Milan Nikolic -OutputBaseFilename=m64py-0.1.1-setup +OutputBaseFilename=m64py-0.1.4-setup UninstallDisplayIcon={app}\m64py.exe LicenseFile=m64py\COPYING DisableStartupPrompt=yes @@ -60,3 +60,13 @@ Filename: {app}\m64py.exe; Description: {cm:LaunchProgram,m64py}; Flags: nowait [Dirs] Tasks: desktopicon; Name: C:\m64py\dist\windows\m64py; + +[Code] +procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); +begin + if CurUninstallStep = usPostUninstall then + begin + if RegKeyExists(HKEY_CURRENT_USER, 'Software\M64Py') then + RegDeleteKeyIncludingSubkeys(HKEY_CURRENT_USER, 'Software\M64Py'); + end; +end; diff --git a/dist/windows/m64py.iss.in b/dist/windows/m64py.iss.in new file mode 100644 index 0000000..00e8fa2 --- /dev/null +++ b/dist/windows/m64py.iss.in @@ -0,0 +1,72 @@ +[Setup] +AppName=M64Py +AppVerName=M64Py {VERSION} +VersionInfoVersion={VERSION} +AppPublisher= +AppPublisherURL=http://m64py.sourceforge.net/ +AppSupportURL= +AppUpdatesURL= +DefaultDirName={pf}\M64Py +DefaultGroupName=M64Py +AllowNoIcons=yes +OutputDir=. +Uninstallable=yes +WindowVisible=no +AppCopyright=Author: Milan Nikolic +OutputBaseFilename=m64py-{VERSION}-setup +UninstallDisplayIcon={app}\m64py.exe +LicenseFile=m64py\COPYING +DisableStartupPrompt=yes +ChangesAssociations=yes + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; + +[Files] +Source: "m64py\*.ttf"; DestDir: "{app}"; +Source: "m64py\*.ini"; DestDir: "{app}"; +Source: "m64py\*.txt"; DestDir: "{app}"; +Source: "m64py\*.pyd"; DestDir: "{app}"; +Source: "m64py\*.exe"; DestDir: "{app}"; +Source: "m64py\*.dll"; DestDir: "{app}"; +Source: "m64py\AUTHORS"; DestDir: "{app}"; +Source: "m64py\COPYING"; DestDir: "{app}"; +Source: "m64py\README"; DestDir: "{app}"; +Source: "m64py\ChangeLog"; DestDir: "{app}"; +Source: "m64py\*.v64"; DestDir: "{app}\test"; +Source: "m64py\qt4_plugins\codecs\*.dll"; DestDir: "{app}\qt4_plugins\codecs"; +Source: "m64py\qt4_plugins\iconengines\*.dll"; DestDir: "{app}\qt4_plugins\iconengines"; +Source: "m64py\qt4_plugins\imageformats\*.dll"; DestDir: "{app}\qt4_plugins\imageformats"; +Source: "m64py\doc\*"; DestDir: "{app}\doc"; + +[Icons] +Name: {group}\M64Py; Filename: {app}\m64py.exe; Tasks: desktopicon; +Name: {group}\{cm:ProgramOnTheWeb,m64py}; Filename: http://m64py.sourceforge.net/; +Name: {group}\{cm:UninstallProgram,m64py}; Filename: {app}\unins000.exe; +Name: {userdesktop}\M64Py; Filename: {app}\m64py.exe; Tasks: desktopicon; + +[Registry] +Root: HKCR; Subkey: ".v64"; ValueType: string; ValueData: "Mupen64Plus.Document"; Flags: uninsdeletevalue +Root: HKCR; Subkey: "Mupen64Plus.Document"; ValueType: string; ValueData: "Nintendo64 ROM"; Flags: uninsdeletekey +Root: HKCR; SubKey: Mupen64Plus.Document\DefaultIcon; ValueType: string; ValueData: {app}\m64py.ico; +Root: HKCR; SubKey: Mupen64Plus.Document\shell\open\command; ValueType: string; ValueData: """{app}\m64py.exe"" ""%1"""; +Root: HKCR; SubKey: ".z64"; ValueType: string; ValueData: "Mupen64Plus.Document"; Flags: uninsdeletevalue; +Root: HKCR; SubKey: Mupen64Plus.Document; ValueType: string; ValueData: "Nintendo64 ROM"; Flags: uninsdeletekey; +Root: HKCR; SubKey: Mupen64Plus.Document\DefaultIcon; ValueType: string; ValueData: {app}\m64py.ico; +Root: HKCR; SubKey: Mupen64Plus.Document\shell\open\command; ValueType: string; ValueData: """{app}\m64py.exe"" ""%1"""; + +[Run] +Filename: {app}\m64py.exe; Description: {cm:LaunchProgram,m64py}; Flags: nowait postinstall skipifsilent; + +[Dirs] +Tasks: desktopicon; Name: C:\m64py\dist\windows\m64py; + +[Code] +procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); +begin + if CurUninstallStep = usPostUninstall then + begin + if RegKeyExists(HKEY_CURRENT_USER, 'Software\M64Py') then + RegDeleteKeyIncludingSubkeys(HKEY_CURRENT_USER, 'Software\M64Py'); + end; +end; diff --git a/dist/windows/m64py.spec b/dist/windows/m64py.spec index ed95c6d..d31af98 100644 --- a/dist/windows/m64py.spec +++ b/dist/windows/m64py.spec @@ -1,20 +1,23 @@ # -*- mode: python -*- a = Analysis([os.path.join(HOMEPATH,'support\\_mountzlib.py'), 'c:\\m64py\\m64py'], - pathex=['c:\\m64py\\pyinstaller', 'c:\\m64py\\src']) + pathex=['c:\\m64py\\pyinstaller', 'c:\\m64py\\src']) + pyz = PYZ(a.pure) + exe = EXE(pyz, - a.scripts, - exclude_binaries=1, - name=os.path.join('build\\pyi.win32\\m64py', 'm64py.exe'), - debug=False, - strip=False, - upx=True, - console=False, icon='c:\\m64py\\dist\\windows\\m64py.ico') + a.scripts, + exclude_binaries=1, + name=os.path.join('build\\pyi.win32\\m64py', 'm64py.exe'), + debug=False, + strip=False, + upx=True, + console=False, icon='c:\\m64py\\dist\\windows\\m64py.ico') + coll = COLLECT(exe, - a.binaries, - a.zipfiles, - a.datas, - strip=False, - upx=True, - name='m64py') + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=True, + name='m64py') diff --git a/dist/windows/version.sh b/dist/windows/version.sh new file mode 100755 index 0000000..261188a --- /dev/null +++ b/dist/windows/version.sh @@ -0,0 +1,3 @@ +#!/bin/sh +VERSION=`cat ../../src/m64py/core/defs.py | grep FRONTEND_VERSION | awk -F' = ' '{print $2}' | tr -d '"'` +sed "s/{VERSION}/$VERSION/g" m64py.iss.in > m64py.iss diff --git a/src/m64py/core/defs.py b/src/m64py/core/defs.py index d4d3d65..5cfaa55 100644 --- a/src/m64py/core/defs.py +++ b/src/m64py/core/defs.py @@ -20,9 +20,9 @@ from m64py.platform import DLL_EXT CORE_NAME = "mupen64plus" CORE_API_VERSION = 0x20001 -CONFIG_API_VERSION = 0x20000 -MINIMUM_CORE_VERSION = 0x016300 -FRONTEND_VERSION = "0.1.2" +CONFIG_API_VERSION = 0x20200 +MINIMUM_CORE_VERSION = 0x016305 +FRONTEND_VERSION = "0.1.4" SIZE_1X = (320, 240) SIZE_2X = (640, 480)