Skip to content

Commit

Permalink
prepare release
Browse files Browse the repository at this point in the history
  • Loading branch information
gen2brain committed May 4, 2015
1 parent 0ca8f8a commit ebf5dd4
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 19 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
v0.2.3 May 04, 2015:

* Migrated to Qt5
* Python3 support
* Toggle video extension without restart
* Add windows portable build

v0.2.2 Oct 18, 2014:

* Initial Python3 support
* Add special SDL2 joystick event system for input config
* Add support for non-native rom files in romlist
* Many bug fixes, full log http://git.io/yRePKw

v0.2.1 Mar 09, 2014:

* Greatly speed up reading ROM list
* Check if core supports DelaySI/CountPerOp options
* Add support for OpenBSD plugin paths
Expand Down
2 changes: 1 addition & 1 deletion dist/debian/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
apt-get -y install build-essential debhelper pyqt5-dev-tools dh-python python python-pyqt5 python-pyqt5.qtopengl
apt-get -y install build-essential debhelper pyqt5-dev-tools dh-python python python3-pyqt5 python3-pyqt5.qtopengl
rm -rf ../../debian/
cp -fr ../debian/ ../../
cd ../../
Expand Down
22 changes: 9 additions & 13 deletions dist/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,22 @@ Homepage: http://m64py.sourceforge.net/
Build-Depends:
debhelper (>= 9),
dh-python,
python,
python-pyqt5,
python3,
python3-pyqt5,
pyqt5-dev-tools,
X-Python-Version: >= 2.5
X-Python3-Version: >= 3.4

Package: m64py
Architecture: all
Depends:
${misc:Depends},
python,
libsdl1.2-dev,
python-pyqt5,
python-pyqt5.qtopengl,
python-pyqt5.qtsvg,
python3,
libsdl2-dev,
python3-pyqt5,
python3-pyqt5.qtopengl,
python3-pyqt5.qtsvg,
Recommends:
libmupen64plus2,
mupen64plus-audio-all | mupen64plus-audio,
mupen64plus-input-all | mupen64plus-input,
mupen64plus-rsp-all | mupen64plus-rsp,
mupen64plus-video-all | mupen64plus-video,
mupen64plus,
python-lzma | p7zip,
python-opengl,
unrar,
Expand Down
4 changes: 2 additions & 2 deletions dist/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

export PYBUILD_DESTDIR=debian/m64py
export PYBUILD_CONFIGURE_ARGS=config
export PYBUILD_BUILD_ARGS_python2=build_ext
export PYBUILD_BUILD_ARGS_python3=build_ext
export PYBUILD_INSTALL_ARGS=--install-layout=deb \
--install-scripts=/usr/share/m64py \
--install-lib=/usr/share/m64py
Expand All @@ -14,7 +14,7 @@ VERSION = $(shell cat src/m64py/core/defs.py | grep FRONTEND_VERSION | awk -F' =
RELEASE = 0

binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
dh $@ --with=python2 --parallel --list-missing --buildsystem=pybuild
dh $@ --with=python3 --parallel --list-missing --buildsystem=pybuild

override_dh_auto_install:
dh_auto_install
Expand Down
2 changes: 1 addition & 1 deletion dist/macosx/m64py.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DIST_DIR = os.environ["DIST_DIR"]
BASE_DIR = os.environ["BASE_DIR"]

a = Analysis([join(BASE_DIR, 'm64py')], pathex=[join(BASE_DIR, 'src')],
hiddenimports=[],
hiddenimports=['pickle', 'PyQt5.Qt'],
hookspath=None,
runtime_hooks=None)

Expand Down
1 change: 1 addition & 0 deletions dist/windows/m64py.iss.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Source: "m64py\README.md"; DestDir: "{app}";
Source: "m64py\ChangeLog"; DestDir: "{app}";
Source: "m64py\*.v64"; DestDir: "{app}";
Source: "m64py\qt5_plugins\platforms\qwindows.dll"; DestDir: "{app}\qt5_plugins\platforms";
Source: "m64py\qt5_plugins\imageformats\qjpeg.dll"; DestDir: "{app}\qt5_plugins\imageformats";
Source: "m64py\qt5_plugins\imageformats\qsvg.dll"; DestDir: "{app}\qt5_plugins\imageformats";
Source: "m64py\doc\*"; DestDir: "{app}\doc";

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def run_build(self):
spec_file = join(self.dist_dir, "m64py.spec")
os.environ["BASE_DIR"] = BASE_DIR
os.environ["DIST_DIR"] = self.dist_dir
opts = {"distpath": self.dist_dir, "workpath": work_path, "clean_build": True, "upx_dir": None}
opts = {"distpath": self.dist_dir, "workpath": work_path, "clean_build": True, "upx_dir": None, "debug": False}
PyInstaller.build.main(None, spec_file, True, **opts)

def run(self):
Expand Down
2 changes: 1 addition & 1 deletion src/m64py/core/defs.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
CORE_API_VERSION = 0x20001
CONFIG_API_VERSION = 0x20000
MINIMUM_CORE_VERSION = 0x016300
FRONTEND_VERSION = "0.2.2"
FRONTEND_VERSION = "0.2.3"

SIZE_1X = (320, 240)
SIZE_2X = (640, 480)
Expand Down

0 comments on commit ebf5dd4

Please sign in to comment.