3 files changed, 116 insertions, 126 deletions
diff --git a/.travis-upload.sh b/.travis-upload.sh
index 8cfab31cb..17959b0e1 100755
--- a/.travis-upload.sh
+++ b/.travis-upload.sh
@@ -1,134 +1,132 @@
-if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then
+GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
-    GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
+GITREV="`git show -s --format='%h'`"
-    GITREV="`git show -s --format='%h'`"
+mkdir -p artifacts
-    mkdir -p artifacts
+if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-    if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
+    REV_NAME="citra-linux-${GITDATE}-${GITREV}"
-        REV_NAME="citra-linux-${GITDATE}-${GITREV}"
+    ARCHIVE_NAME="${REV_NAME}.tar.xz"
-        ARCHIVE_NAME="${REV_NAME}.tar.xz"
+    COMPRESSION_FLAGS="-cJvf"
-        COMPRESSION_FLAGS="-cJvf"
+    mkdir "$REV_NAME"
-        mkdir "$REV_NAME"
+    cp build/src/citra/citra "$REV_NAME"
-        cp build/src/citra/citra "$REV_NAME"
+    cp build/src/citra_qt/citra-qt "$REV_NAME"
-        cp build/src/citra_qt/citra-qt "$REV_NAME"
+elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    REV_NAME="citra-osx-${GITDATE}-${GITREV}"
-        REV_NAME="citra-osx-${GITDATE}-${GITREV}"
+    ARCHIVE_NAME="${REV_NAME}.tar.gz"
-        ARCHIVE_NAME="${REV_NAME}.tar.gz"
+    COMPRESSION_FLAGS="-czvf"
-        COMPRESSION_FLAGS="-czvf"
+    mkdir "$REV_NAME"
-        mkdir "$REV_NAME"
+    cp build/src/citra/Release/citra "$REV_NAME"
-        cp build/src/citra/Release/citra "$REV_NAME"
+    cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME"
-        cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME"
+    # move qt libs into app bundle for deployment
-        # move qt libs into app bundle for deployment
+    $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"
-        $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"
+    # move SDL2 libs into folder for deployment
-        # move SDL2 libs into folder for deployment
+    dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"
-        dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"
+    # Make the changes to make the citra-qt app standalone (i.e. not dependent on the current brew installation).
-        # Make the changes to make the citra-qt app standalone (i.e. not dependent on the current brew installation).
+    # To do this, the absolute references to each and every QT framework must be re-written to point to the local frameworks
-        # To do this, the absolute references to each and every QT framework must be re-written to point to the local frameworks
+    # (in the Contents/Frameworks folder).
-        # (in the Contents/Frameworks folder).
+    # The "install_name_tool" is used to do so.
-        # The "install_name_tool" is used to do so.
+    # Coreutils is a hack to coerce Homebrew to point to the absolute Cellar path (symlink dereferenced). i.e:
-        # Coreutils is a hack to coerce Homebrew to point to the absolute Cellar path (symlink dereferenced). i.e:
+    # ls -l /usr/local/opt/qt5:: /usr/local/opt/qt5 -> ../Cellar/qt5/5.6.1-1
-        # ls -l /usr/local/opt/qt5:: /usr/local/opt/qt5 -> ../Cellar/qt5/5.6.1-1
+    # grealpath ../Cellar/qt5/5.6.1-1:: /usr/local/Cellar/qt5/5.6.1-1
-        # grealpath ../Cellar/qt5/5.6.1-1:: /usr/local/Cellar/qt5/5.6.1-1
+    brew install coreutils
-        brew install coreutils
+    REV_NAME_ALT=$REV_NAME/
-        REV_NAME_ALT=$REV_NAME/
+    # grealpath is located in coreutils, there is no "realpath" for OS X :(
-        # grealpath is located in coreutils, there is no "realpath" for OS X :(
+    QT_BREWS_PATH=$(grealpath "$(brew --prefix qt5)")
-        QT_BREWS_PATH=$(grealpath "$(brew --prefix qt5)")
+    BREW_PATH=$(brew --prefix)
-        BREW_PATH=$(brew --prefix)
+    QT_VERSION_NUM=5
-        QT_VERSION_NUM=5
+    $BREW_PATH/opt/qt5/bin/macdeployqt "${REV_NAME_ALT}citra-qt.app" \
-        $BREW_PATH/opt/qt5/bin/macdeployqt "${REV_NAME_ALT}citra-qt.app" \
+        -executable="${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt"
-            -executable="${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt"
+    # These are the files that macdeployqt packed into Contents/Frameworks/ - we don't want those, so we replace them.
-        # These are the files that macdeployqt packed into Contents/Frameworks/ - we don't want those, so we replace them.
+    declare -a macos_libs=("QtCore" "QtWidgets" "QtGui" "QtOpenGL" "QtPrintSupport")
-        declare -a macos_libs=("QtCore" "QtWidgets" "QtGui" "QtOpenGL" "QtPrintSupport")
+    for macos_lib in "${macos_libs[@]}"
-        for macos_lib in "${macos_libs[@]}"
+    do
+        SC_FRAMEWORK_PART=$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib
+        # Replace macdeployqt versions of the Frameworks with our own (from /usr/local/opt/qt5/lib/)
+        cp "$BREW_PATH/opt/qt5/lib/$SC_FRAMEWORK_PART" "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
+        # Replace references within the embedded Framework files with "internal" versions.
+        for macos_lib2 in "${macos_libs[@]}"
        do
-            SC_FRAMEWORK_PART=$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib
+            # Since brew references both the non-symlinked and symlink paths of QT5, it needs to be duplicated.
-            # Replace macdeployqt versions of the Frameworks with our own (from /usr/local/opt/qt5/lib/)
+            # /usr/local/Cellar/qt5/5.6.1-1/lib and /usr/local/opt/qt5/lib both resolve to the same files.
-            cp "$BREW_PATH/opt/qt5/lib/$SC_FRAMEWORK_PART" "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
+            # So the two lines below are effectively duplicates when resolved as a path, but as strings, they aren't.
+            RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
-            # Replace references within the embedded Framework files with "internal" versions.
+            install_name_tool -change \
-            for macos_lib2 in "${macos_libs[@]}"
+                $QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
-            do
+                @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                # Since brew references both the non-symlinked and symlink paths of QT5, it needs to be duplicated.
+                "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
-                # /usr/local/Cellar/qt5/5.6.1-1/lib and /usr/local/opt/qt5/lib both resolve to the same files.
+            install_name_tool -change \
-                # So the two lines below are effectively duplicates when resolved as a path, but as strings, they aren't.
+                "$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
-                RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
+                @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                install_name_tool -change \
+                "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
-                    $QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
-                    @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                    "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
-                install_name_tool -change \
-                    "$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
-                    @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                    "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
-            done
        done
+    done
-        # Handles `This application failed to start because it could not find or load the Qt platform plugin "cocoa"`
-        # Which manifests itself as:
+    # Handles `This application failed to start because it could not find or load the Qt platform plugin "cocoa"`
-        # "Exception Type: EXC_CRASH (SIGABRT) | Exception Codes: 0x0000000000000000, 0x0000000000000000 | Exception Note: EXC_CORPSE_NOTIFY"
+    # Which manifests itself as:
-        # There may be more dylibs needed to be fixed...
+    # "Exception Type: EXC_CRASH (SIGABRT) | Exception Codes: 0x0000000000000000, 0x0000000000000000 | Exception Note: EXC_CORPSE_NOTIFY"
-        declare -a macos_plugins=("Plugins/platforms/libqcocoa.dylib")
+    # There may be more dylibs needed to be fixed...
+    declare -a macos_plugins=("Plugins/platforms/libqcocoa.dylib")
-        for macos_lib in "${macos_plugins[@]}"
+    for macos_lib in "${macos_plugins[@]}"
+    do
+        install_name_tool -id @executable_path/../$macos_lib "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
+        for macos_lib2 in "${macos_libs[@]}"
        do
-            install_name_tool -id @executable_path/../$macos_lib "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
+            RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
-            for macos_lib2 in "${macos_libs[@]}"
+            install_name_tool -change \
-            do
+                $QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
-                RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
+                @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                install_name_tool -change \
+                "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
-                    $QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
+            install_name_tool -change \
-                    @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
+                "$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
-                    "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
+                @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                install_name_tool -change \
+                "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
-                    "$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
-                    @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                    "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
-            done
        done
+    done
-        for macos_lib in "${macos_libs[@]}"
+    for macos_lib in "${macos_libs[@]}"
-        do
+    do
-            # Debugging info for Travis-CI
+        # Debugging info for Travis-CI
-            otool -L "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib"
+        otool -L "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib"
-        done
+    done
-        # Make the citra-qt.app application launch a debugging terminal.
+    # Make the citra-qt.app application launch a debugging terminal.
-        # Store away the actual binary
+    # Store away the actual binary
-        mv ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt-bin
+    mv ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt-bin
-        cat > ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt <<EOL
+    cat > ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt <<EOL
 #!/usr/bin/env bash
 cd "\`dirname "\$0"\`"
 chmod +x citra-qt-bin
 open citra-qt-bin --args "\$@"
 EOL
-        # Content that will serve as the launching script for citra (within the .app folder)
+    # Content that will serve as the launching script for citra (within the .app folder)
-        # Make the launching script executable
+    # Make the launching script executable
-        chmod +x ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt
+    chmod +x ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt
-    fi
+fi
-    # Copy documentation
+# Copy documentation
-    cp license.txt "$REV_NAME"
+cp license.txt "$REV_NAME"
-    cp README.md "$REV_NAME"
+cp README.md "$REV_NAME"
-    tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME"
+tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME"
-    mv "$REV_NAME" nightly
+mv "$REV_NAME" nightly
-    7z a "$REV_NAME.7z" nightly
+7z a "$REV_NAME.7z" nightly
-    # move the compiled archive into the artifacts directory to be uploaded by travis releases
+# move the compiled archive into the artifacts directory to be uploaded by travis releases
-    mv "$ARCHIVE_NAME" artifacts/
+mv "$ARCHIVE_NAME" artifacts/
-    mv "$REV_NAME.7z" artifacts/
+mv "$REV_NAME.7z" artifacts/
-fi
diff --git a/.travis.yml b/.travis.yml
index 846758881..3da22eb5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,4 +37,4 @@ deploy:
  file: "artifacts/*"
  skip_cleanup: true
  on:
-    repo: citra-emu/citra-nightly
+    tags: true
diff --git a/appveyor.yml b/appveyor.yml
index d062a1f3e..eb4e7df87 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,6 @@
 # shallow clone
 clone_depth: 10
-# don't build on tag
-skip_tags: true
 cache:
  - C:\ProgramData\chocolatey\bin -> appveyor.yml
  - C:\ProgramData\chocolatey\lib -> appveyor.yml
@@ -72,16 +69,11 @@ artifacts:
 deploy:
  provider: GitHub
-  release: nightly-$(appveyor_build_number)
+  release: $(appveyor_repo_tag_name)
-  description: |
-    Citra nightly releases. Please choose the correct download for your operating system from the list below.
-    Short Commit Hash $(GITREV)
  auth_token:
    secure: "dbpsMC/MgPKWFNJCXpQl4cR8FYhepkPLjgNp/pRMktZ8oLKTqPYErfreaIxb/4P1"
  artifact: msvcupdate,msvcbuild
  draft: false
  prerelease: false
  on:
-    branch: master
+    appveyor_repo_tag: true
-    appveyor_repo_name: citra-emu/citra-nightly

diff --git a/.travis-upload.sh b/.travis-upload.sh index 8cfab31cb..17959b0e1 100755 --- a/.travis-upload.sh +++ b/.travis-upload.sh
@@ -1,134 +1,132 @@
1	if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then	1	GITDATE="`git show -s --date=short --format='%ad' \| sed 's/-//g'`"
2	GITDATE="`git show -s --date=short --format='%ad' \| sed 's/-//g'`"	2	GITREV="`git show -s --format='%h'`"
3	GITREV="`git show -s --format='%h'`"	3	mkdir -p artifacts
4	mkdir -p artifacts	4
5		5	if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
6	if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then	6	REV_NAME="citra-linux-${GITDATE}-${GITREV}"
7	REV_NAME="citra-linux-${GITDATE}-${GITREV}"	7	ARCHIVE_NAME="${REV_NAME}.tar.xz"
8	ARCHIVE_NAME="${REV_NAME}.tar.xz"	8	COMPRESSION_FLAGS="-cJvf"
9	COMPRESSION_FLAGS="-cJvf"	9	mkdir "$REV_NAME"
10	mkdir "$REV_NAME"	10
11		11	cp build/src/citra/citra "$REV_NAME"
12	cp build/src/citra/citra "$REV_NAME"	12	cp build/src/citra_qt/citra-qt "$REV_NAME"
13	cp build/src/citra_qt/citra-qt "$REV_NAME"	13	elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
14	elif [ "$TRAVIS_OS_NAME" = "osx" ]; then	14	REV_NAME="citra-osx-${GITDATE}-${GITREV}"
15	REV_NAME="citra-osx-${GITDATE}-${GITREV}"	15	ARCHIVE_NAME="${REV_NAME}.tar.gz"
16	ARCHIVE_NAME="${REV_NAME}.tar.gz"	16	COMPRESSION_FLAGS="-czvf"
17	COMPRESSION_FLAGS="-czvf"	17	mkdir "$REV_NAME"
18	mkdir "$REV_NAME"	18
19		19	cp build/src/citra/Release/citra "$REV_NAME"
20	cp build/src/citra/Release/citra "$REV_NAME"	20	cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME"
21	cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME"	21
22		22	# move qt libs into app bundle for deployment
23	# move qt libs into app bundle for deployment	23	$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"
24	$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"	24
25		25	# move SDL2 libs into folder for deployment
26	# move SDL2 libs into folder for deployment	26	dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"
27	dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"	27
28		28	# Make the changes to make the citra-qt app standalone (i.e. not dependent on the current brew installation).
29	# Make the changes to make the citra-qt app standalone (i.e. not dependent on the current brew installation).	29	# To do this, the absolute references to each and every QT framework must be re-written to point to the local frameworks
30	# To do this, the absolute references to each and every QT framework must be re-written to point to the local frameworks	30	# (in the Contents/Frameworks folder).
31	# (in the Contents/Frameworks folder).	31	# The "install_name_tool" is used to do so.
32	# The "install_name_tool" is used to do so.	32
33		33	# Coreutils is a hack to coerce Homebrew to point to the absolute Cellar path (symlink dereferenced). i.e:
34	# Coreutils is a hack to coerce Homebrew to point to the absolute Cellar path (symlink dereferenced). i.e:	34	# ls -l /usr/local/opt/qt5:: /usr/local/opt/qt5 -> ../Cellar/qt5/5.6.1-1
35	# ls -l /usr/local/opt/qt5:: /usr/local/opt/qt5 -> ../Cellar/qt5/5.6.1-1	35	# grealpath ../Cellar/qt5/5.6.1-1:: /usr/local/Cellar/qt5/5.6.1-1
36	# grealpath ../Cellar/qt5/5.6.1-1:: /usr/local/Cellar/qt5/5.6.1-1	36	brew install coreutils
37	brew install coreutils	37
38		38	REV_NAME_ALT=$REV_NAME/
39	REV_NAME_ALT=$REV_NAME/	39	# grealpath is located in coreutils, there is no "realpath" for OS X :(
40	# grealpath is located in coreutils, there is no "realpath" for OS X :(	40	QT_BREWS_PATH=$(grealpath "$(brew --prefix qt5)")
41	QT_BREWS_PATH=$(grealpath "$(brew --prefix qt5)")	41	BREW_PATH=$(brew --prefix)
42	BREW_PATH=$(brew --prefix)	42	QT_VERSION_NUM=5
43	QT_VERSION_NUM=5	43
44		44	$BREW_PATH/opt/qt5/bin/macdeployqt "${REV_NAME_ALT}citra-qt.app" \
45	$BREW_PATH/opt/qt5/bin/macdeployqt "${REV_NAME_ALT}citra-qt.app" \	45	-executable="${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt"
46	-executable="${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt"	46
47		47	# These are the files that macdeployqt packed into Contents/Frameworks/ - we don't want those, so we replace them.
48	# These are the files that macdeployqt packed into Contents/Frameworks/ - we don't want those, so we replace them.	48	declare -a macos_libs=("QtCore" "QtWidgets" "QtGui" "QtOpenGL" "QtPrintSupport")
49	declare -a macos_libs=("QtCore" "QtWidgets" "QtGui" "QtOpenGL" "QtPrintSupport")	49
50		50	for macos_lib in "${macos_libs[@]}"
51	for macos_lib in "${macos_libs[@]}"	51	do
		52	SC_FRAMEWORK_PART=$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib
		53	# Replace macdeployqt versions of the Frameworks with our own (from /usr/local/opt/qt5/lib/)
		54	cp "$BREW_PATH/opt/qt5/lib/$SC_FRAMEWORK_PART" "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
		55
		56	# Replace references within the embedded Framework files with "internal" versions.
		57	for macos_lib2 in "${macos_libs[@]}"
52	do	58	do
53	SC_FRAMEWORK_PART=$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib	59	# Since brew references both the non-symlinked and symlink paths of QT5, it needs to be duplicated.
54	# Replace macdeployqt versions of the Frameworks with our own (from /usr/local/opt/qt5/lib/)	60	# /usr/local/Cellar/qt5/5.6.1-1/lib and /usr/local/opt/qt5/lib both resolve to the same files.
55	cp "$BREW_PATH/opt/qt5/lib/$SC_FRAMEWORK_PART" "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"	61	# So the two lines below are effectively duplicates when resolved as a path, but as strings, they aren't.
56		62	RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
57	# Replace references within the embedded Framework files with "internal" versions.	63	install_name_tool -change \
58	for macos_lib2 in "${macos_libs[@]}"	64	$QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
59	do	65	@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
60	# Since brew references both the non-symlinked and symlink paths of QT5, it needs to be duplicated.	66	"${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
61	# /usr/local/Cellar/qt5/5.6.1-1/lib and /usr/local/opt/qt5/lib both resolve to the same files.	67	install_name_tool -change \
62	# So the two lines below are effectively duplicates when resolved as a path, but as strings, they aren't.	68	"$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
63	RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2	69	@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
64	install_name_tool -change \	70	"${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
65	$QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
66	@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
67	"${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
68	install_name_tool -change \
69	"$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
70	@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
71	"${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
72	done
73	done	71	done
74		72	done
75	# Handles `This application failed to start because it could not find or load the Qt platform plugin "cocoa"`	73
76	# Which manifests itself as:	74	# Handles `This application failed to start because it could not find or load the Qt platform plugin "cocoa"`
77	# "Exception Type: EXC_CRASH (SIGABRT) \| Exception Codes: 0x0000000000000000, 0x0000000000000000 \| Exception Note: EXC_CORPSE_NOTIFY"	75	# Which manifests itself as:
78	# There may be more dylibs needed to be fixed...	76	# "Exception Type: EXC_CRASH (SIGABRT) \| Exception Codes: 0x0000000000000000, 0x0000000000000000 \| Exception Note: EXC_CORPSE_NOTIFY"
79	declare -a macos_plugins=("Plugins/platforms/libqcocoa.dylib")	77	# There may be more dylibs needed to be fixed...
80		78	declare -a macos_plugins=("Plugins/platforms/libqcocoa.dylib")
81	for macos_lib in "${macos_plugins[@]}"	79
		80	for macos_lib in "${macos_plugins[@]}"
		81	do
		82	install_name_tool -id @executable_path/../$macos_lib "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
		83	for macos_lib2 in "${macos_libs[@]}"
82	do	84	do
83	install_name_tool -id @executable_path/../$macos_lib "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"	85	RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
84	for macos_lib2 in "${macos_libs[@]}"	86	install_name_tool -change \
85	do	87	$QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
86	RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2	88	@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
87	install_name_tool -change \	89	"${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
88	$QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \	90	install_name_tool -change \
89	@executable_path/../Frameworks/$RM_FRAMEWORK_PART \	91	"$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
90	"${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"	92	@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
91	install_name_tool -change \	93	"${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
92	"$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
93	@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
94	"${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
95	done
96	done	94	done
		95	done
97		96
98	for macos_lib in "${macos_libs[@]}"	97	for macos_lib in "${macos_libs[@]}"
99	do	98	do
100	# Debugging info for Travis-CI	99	# Debugging info for Travis-CI
101	otool -L "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib"	100	otool -L "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib"
102	done	101	done
103		102
104	# Make the citra-qt.app application launch a debugging terminal.	103	# Make the citra-qt.app application launch a debugging terminal.
105	# Store away the actual binary	104	# Store away the actual binary
106	mv ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt-bin	105	mv ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt-bin
107		106
108	cat > ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt <<EOL	107	cat > ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt <<EOL
109	#!/usr/bin/env bash	108	#!/usr/bin/env bash
110	cd "\`dirname "\$0"\`"	109	cd "\`dirname "\$0"\`"
111	chmod +x citra-qt-bin	110	chmod +x citra-qt-bin
112	open citra-qt-bin --args "\$@"	111	open citra-qt-bin --args "\$@"
113	EOL	112	EOL
114	# Content that will serve as the launching script for citra (within the .app folder)	113	# Content that will serve as the launching script for citra (within the .app folder)
115		114
116	# Make the launching script executable	115	# Make the launching script executable
117	chmod +x ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt	116	chmod +x ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt
118		117
119	fi	118	fi
120		119
121	# Copy documentation	120	# Copy documentation
122	cp license.txt "$REV_NAME"	121	cp license.txt "$REV_NAME"
123	cp README.md "$REV_NAME"	122	cp README.md "$REV_NAME"
124		123
125	tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME"	124	tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME"
126		125
127	mv "$REV_NAME" nightly	126	mv "$REV_NAME" nightly
128		127
129	7z a "$REV_NAME.7z" nightly	128	7z a "$REV_NAME.7z" nightly
130		129
131	# move the compiled archive into the artifacts directory to be uploaded by travis releases	130	# move the compiled archive into the artifacts directory to be uploaded by travis releases
132	mv "$ARCHIVE_NAME" artifacts/	131	mv "$ARCHIVE_NAME" artifacts/
133	mv "$REV_NAME.7z" artifacts/	132	mv "$REV_NAME.7z" artifacts/
134	fi


diff --git a/.travis.yml b/.travis.yml index 846758881..3da22eb5d 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -37,4 +37,4 @@ deploy:
37	file: "artifacts/*"	37	file: "artifacts/*"
38	skip_cleanup: true	38	skip_cleanup: true
39	on:	39	on:
40	repo: citra-emu/citra-nightly	40	tags: true


diff --git a/appveyor.yml b/appveyor.yml index d062a1f3e..eb4e7df87 100644 --- a/appveyor.yml +++ b/appveyor.yml
@@ -1,9 +1,6 @@
1	# shallow clone	1	# shallow clone
2	clone_depth: 10	2	clone_depth: 10
3		3
4	# don't build on tag
5	skip_tags: true
6
7	cache:	4	cache:
8	- C:\ProgramData\chocolatey\bin -> appveyor.yml	5	- C:\ProgramData\chocolatey\bin -> appveyor.yml
9	- C:\ProgramData\chocolatey\lib -> appveyor.yml	6	- C:\ProgramData\chocolatey\lib -> appveyor.yml
@@ -72,16 +69,11 @@ artifacts:
72		69
73	deploy:	70	deploy:
74	provider: GitHub	71	provider: GitHub
75	release: nightly-$(appveyor_build_number)	72	release: $(appveyor_repo_tag_name)
76	description: \|
77	Citra nightly releases. Please choose the correct download for your operating system from the list below.
78
79	Short Commit Hash $(GITREV)
80	auth_token:	73	auth_token:
81	secure: "dbpsMC/MgPKWFNJCXpQl4cR8FYhepkPLjgNp/pRMktZ8oLKTqPYErfreaIxb/4P1"	74	secure: "dbpsMC/MgPKWFNJCXpQl4cR8FYhepkPLjgNp/pRMktZ8oLKTqPYErfreaIxb/4P1"
82	artifact: msvcupdate,msvcbuild	75	artifact: msvcupdate,msvcbuild
83	draft: false	76	draft: false
84	prerelease: false	77	prerelease: false
85	on:	78	on:
86	branch: master	79	appveyor_repo_tag: true
87	appveyor_repo_name: citra-emu/citra-nightly