diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index 6578556..d6018df 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -35,3 +35,16 @@ CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts INCLUDEPATH = include + +# Copy dlls needed to make it run +QMAKE_POST_LINK += \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index 6578556..d6018df 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -35,3 +35,16 @@ CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts INCLUDEPATH = include + +# Copy dlls needed to make it run +QMAKE_POST_LINK += \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) diff --git a/applications/Photoframe/README.md b/applications/Photoframe/README.md new file mode 100644 index 0000000..546f337 --- /dev/null +++ b/applications/Photoframe/README.md @@ -0,0 +1,72 @@ + +General +------- + +If there are .bat,.cmd and .sh versions of scripts, that means +to use the one that corresponds to the platform you are on. For +windows this is .bat, for macOS it is .cmd, and for UNIX it is .sh. + + +Building +-------- + +First run the _env script. Adjust as appropriate. You could add +conditional expressions based on `hostname` to customize it if +different for your machine. The _env script is expected to set +QTDIR to where it is installed on your machine and set PATH to +contain qmake. Also MAKE is expected to be set to the command to +be used to run make (for example it could be set to nmake). + +To build, from the provided prompt, then run "sh build-all.sh". +This should work even from windows. + +To clean, run "sh clean.sh" + + +Building on Windows +------------------- + +New instructions: + +The UNIX shell scripts are able to be run from a DOS cmd prompt by +running them with the sh.bat script. For example: + +sh build-all.sh + +This will use the sh.bat script to interpret and translate the unix +commands in to equivalent windows DOS commands. The shell scripts are +therefore obviously restricted to the subset of supported commands that +can be translated to. Environment variables must be surrounded with +braces, eg "${VAR}". Common commands like cp, echo, mkdir, cd are +supported and will translate unix slashes to DOS slashes for all the +arguments. Also the make command is translated to %MAKE%, so it can +be set up to build with VisualStudio by setting MAKE to nmake etc. + +Recent versions of Windows 10 now have curl and tar commands so these +can be used too. With tar you can even use it to zip and unzip files +using the appropriate options instead of specifically using the zip, +gzip etc commands which aren't currently explicitly available yet in +Windows 10. + + +Old instructions: + +First install Qt + MingW compiler +Add both Qt and MingW bin directories to your PATH +Verify they work by opening a command prompt and +typing "make -v" and "qmake -v" and make sure those commands +are found. + +A) Using QDevelop + + 1) First run the "build-libexif.bat" script + 2) Now open Photoframe.pro with QDevelop, click build + 3) Use the "refresh-translations.bat" for deployment + 4) Use "clean.bat" before making a dist package + +B) Using command line only + + 1) "build-all.bat" will do everything + 2) "run.bat" to run it + 3) "clean.bat" to remove everything built + diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index 6578556..d6018df 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -35,3 +35,16 @@ CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts INCLUDEPATH = include + +# Copy dlls needed to make it run +QMAKE_POST_LINK += \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) diff --git a/applications/Photoframe/README.md b/applications/Photoframe/README.md new file mode 100644 index 0000000..546f337 --- /dev/null +++ b/applications/Photoframe/README.md @@ -0,0 +1,72 @@ + +General +------- + +If there are .bat,.cmd and .sh versions of scripts, that means +to use the one that corresponds to the platform you are on. For +windows this is .bat, for macOS it is .cmd, and for UNIX it is .sh. + + +Building +-------- + +First run the _env script. Adjust as appropriate. You could add +conditional expressions based on `hostname` to customize it if +different for your machine. The _env script is expected to set +QTDIR to where it is installed on your machine and set PATH to +contain qmake. Also MAKE is expected to be set to the command to +be used to run make (for example it could be set to nmake). + +To build, from the provided prompt, then run "sh build-all.sh". +This should work even from windows. + +To clean, run "sh clean.sh" + + +Building on Windows +------------------- + +New instructions: + +The UNIX shell scripts are able to be run from a DOS cmd prompt by +running them with the sh.bat script. For example: + +sh build-all.sh + +This will use the sh.bat script to interpret and translate the unix +commands in to equivalent windows DOS commands. The shell scripts are +therefore obviously restricted to the subset of supported commands that +can be translated to. Environment variables must be surrounded with +braces, eg "${VAR}". Common commands like cp, echo, mkdir, cd are +supported and will translate unix slashes to DOS slashes for all the +arguments. Also the make command is translated to %MAKE%, so it can +be set up to build with VisualStudio by setting MAKE to nmake etc. + +Recent versions of Windows 10 now have curl and tar commands so these +can be used too. With tar you can even use it to zip and unzip files +using the appropriate options instead of specifically using the zip, +gzip etc commands which aren't currently explicitly available yet in +Windows 10. + + +Old instructions: + +First install Qt + MingW compiler +Add both Qt and MingW bin directories to your PATH +Verify they work by opening a command prompt and +typing "make -v" and "qmake -v" and make sure those commands +are found. + +A) Using QDevelop + + 1) First run the "build-libexif.bat" script + 2) Now open Photoframe.pro with QDevelop, click build + 3) Use the "refresh-translations.bat" for deployment + 4) Use "clean.bat" before making a dist package + +B) Using command line only + + 1) "build-all.bat" will do everything + 2) "run.bat" to run it + 3) "clean.bat" to remove everything built + diff --git a/applications/Photoframe/README.txt b/applications/Photoframe/README.txt deleted file mode 100755 index c6a56cc..0000000 --- a/applications/Photoframe/README.txt +++ /dev/null @@ -1,43 +0,0 @@ - -Building on Windows -------------------- - - -New instructions: - -The UNIX shell scripts are able to be run from a DOS cmd prompt by -running them with the sh.bat script. For example: - -sh build-all.sh - -This will use the sh.bat script to interpret and translate the unix -commands in to equivalent windows DOS commands. The shell scripts are -therefore obviously restricted to the subset of support commands that -can be translated to. Environment variables must be surrounded with -braces, eg "${VAR}". Common commands like cp, echo, mkdir, cd are -supported and will translate unix slashes to DOS slashes for all the -arguments. Also the make command is translated to %MAKE%, so it can -be set up to build with VisualStudio by setting MAKE to nmake. - - - -First install Qt + MingW compiler -Add both Qt and MingW bin directories to your PATH -Verify they work by opening a command prompt and -typing "make -v" and "qmake -v" and make sure command -are found. - - -A) Using QDevelop - - 1) First run the "build-libexif.bat" script - 2) Now open Photoframe.pro with QDevelop, click build - 3) Use the "refresh-translations.bat" for deployment - 4) Use "clean.bat" before making a dist package - -B) Using command line only - - 1) "build-all.bat" will do everything - 2) "run.bat" to run it - 3) "clean.bat" to remove everything built - diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index 6578556..d6018df 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -35,3 +35,16 @@ CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts INCLUDEPATH = include + +# Copy dlls needed to make it run +QMAKE_POST_LINK += \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ + $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) diff --git a/applications/Photoframe/README.md b/applications/Photoframe/README.md new file mode 100644 index 0000000..546f337 --- /dev/null +++ b/applications/Photoframe/README.md @@ -0,0 +1,72 @@ + +General +------- + +If there are .bat,.cmd and .sh versions of scripts, that means +to use the one that corresponds to the platform you are on. For +windows this is .bat, for macOS it is .cmd, and for UNIX it is .sh. + + +Building +-------- + +First run the _env script. Adjust as appropriate. You could add +conditional expressions based on `hostname` to customize it if +different for your machine. The _env script is expected to set +QTDIR to where it is installed on your machine and set PATH to +contain qmake. Also MAKE is expected to be set to the command to +be used to run make (for example it could be set to nmake). + +To build, from the provided prompt, then run "sh build-all.sh". +This should work even from windows. + +To clean, run "sh clean.sh" + + +Building on Windows +------------------- + +New instructions: + +The UNIX shell scripts are able to be run from a DOS cmd prompt by +running them with the sh.bat script. For example: + +sh build-all.sh + +This will use the sh.bat script to interpret and translate the unix +commands in to equivalent windows DOS commands. The shell scripts are +therefore obviously restricted to the subset of supported commands that +can be translated to. Environment variables must be surrounded with +braces, eg "${VAR}". Common commands like cp, echo, mkdir, cd are +supported and will translate unix slashes to DOS slashes for all the +arguments. Also the make command is translated to %MAKE%, so it can +be set up to build with VisualStudio by setting MAKE to nmake etc. + +Recent versions of Windows 10 now have curl and tar commands so these +can be used too. With tar you can even use it to zip and unzip files +using the appropriate options instead of specifically using the zip, +gzip etc commands which aren't currently explicitly available yet in +Windows 10. + + +Old instructions: + +First install Qt + MingW compiler +Add both Qt and MingW bin directories to your PATH +Verify they work by opening a command prompt and +typing "make -v" and "qmake -v" and make sure those commands +are found. + +A) Using QDevelop + + 1) First run the "build-libexif.bat" script + 2) Now open Photoframe.pro with QDevelop, click build + 3) Use the "refresh-translations.bat" for deployment + 4) Use "clean.bat" before making a dist package + +B) Using command line only + + 1) "build-all.bat" will do everything + 2) "run.bat" to run it + 3) "clean.bat" to remove everything built + diff --git a/applications/Photoframe/README.txt b/applications/Photoframe/README.txt deleted file mode 100755 index c6a56cc..0000000 --- a/applications/Photoframe/README.txt +++ /dev/null @@ -1,43 +0,0 @@ - -Building on Windows -------------------- - - -New instructions: - -The UNIX shell scripts are able to be run from a DOS cmd prompt by -running them with the sh.bat script. For example: - -sh build-all.sh - -This will use the sh.bat script to interpret and translate the unix -commands in to equivalent windows DOS commands. The shell scripts are -therefore obviously restricted to the subset of support commands that -can be translated to. Environment variables must be surrounded with -braces, eg "${VAR}". Common commands like cp, echo, mkdir, cd are -supported and will translate unix slashes to DOS slashes for all the -arguments. Also the make command is translated to %MAKE%, so it can -be set up to build with VisualStudio by setting MAKE to nmake. - - - -First install Qt + MingW compiler -Add both Qt and MingW bin directories to your PATH -Verify they work by opening a command prompt and -typing "make -v" and "qmake -v" and make sure command -are found. - - -A) Using QDevelop - - 1) First run the "build-libexif.bat" script - 2) Now open Photoframe.pro with QDevelop, click build - 3) Use the "refresh-translations.bat" for deployment - 4) Use "clean.bat" before making a dist package - -B) Using command line only - - 1) "build-all.bat" will do everything - 2) "run.bat" to run it - 3) "clean.bat" to remove everything built - diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 3dc5fee..c6ec342 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -11,5 +11,6 @@ mkdir -p build cd build qmake .. +qmake -tp vc .. make cd ..