diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/dos.inc b/applications/Photoframe/dos.inc index e062ce6..60b3639 100755 --- a/applications/Photoframe/dos.inc +++ b/applications/Photoframe/dos.inc @@ -15,7 +15,7 @@ while [ $# -ne 0 ] do # echo -E -- "$1" | tr "\\" "~" | sed "s/ \/\([a-zA-Z0-9]*\)/ -\1/g" | tr "~" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" - echo -E -- "$1" | tr "\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" + echo -E -- "$1" | tr "\\\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" echo -n " " shift done @@ -24,7 +24,7 @@ function fix_args() { - ARGS=`fix_args1 $@` + ARGS=`fix_args1 ${@}` ARGS=`eval echo -- $ARGS | sed "s/^-- //g"` echo "$ARGS" } @@ -41,8 +41,9 @@ function copy() { + echo '"Copy: '${@}'"' debug "Copy: `which cp` `fix_args "$@"`" - `which cp` `fix_args "$@"` + `which cp` `fix_args "${@}"` } function md() diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/dos.inc b/applications/Photoframe/dos.inc index e062ce6..60b3639 100755 --- a/applications/Photoframe/dos.inc +++ b/applications/Photoframe/dos.inc @@ -15,7 +15,7 @@ while [ $# -ne 0 ] do # echo -E -- "$1" | tr "\\" "~" | sed "s/ \/\([a-zA-Z0-9]*\)/ -\1/g" | tr "~" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" - echo -E -- "$1" | tr "\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" + echo -E -- "$1" | tr "\\\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" echo -n " " shift done @@ -24,7 +24,7 @@ function fix_args() { - ARGS=`fix_args1 $@` + ARGS=`fix_args1 ${@}` ARGS=`eval echo -- $ARGS | sed "s/^-- //g"` echo "$ARGS" } @@ -41,8 +41,9 @@ function copy() { + echo '"Copy: '${@}'"' debug "Copy: `which cp` `fix_args "$@"`" - `which cp` `fix_args "$@"` + `which cp` `fix_args "${@}"` } function md() diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index c820874..2820549 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/dos.inc b/applications/Photoframe/dos.inc index e062ce6..60b3639 100755 --- a/applications/Photoframe/dos.inc +++ b/applications/Photoframe/dos.inc @@ -15,7 +15,7 @@ while [ $# -ne 0 ] do # echo -E -- "$1" | tr "\\" "~" | sed "s/ \/\([a-zA-Z0-9]*\)/ -\1/g" | tr "~" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" - echo -E -- "$1" | tr "\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" + echo -E -- "$1" | tr "\\\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" echo -n " " shift done @@ -24,7 +24,7 @@ function fix_args() { - ARGS=`fix_args1 $@` + ARGS=`fix_args1 ${@}` ARGS=`eval echo -- $ARGS | sed "s/^-- //g"` echo "$ARGS" } @@ -41,8 +41,9 @@ function copy() { + echo '"Copy: '${@}'"' debug "Copy: `which cp` `fix_args "$@"`" - `which cp` `fix_args "$@"` + `which cp` `fix_args "${@}"` } function md() diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index c820874..2820549 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 2624038..0a969cc 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/dos.inc b/applications/Photoframe/dos.inc index e062ce6..60b3639 100755 --- a/applications/Photoframe/dos.inc +++ b/applications/Photoframe/dos.inc @@ -15,7 +15,7 @@ while [ $# -ne 0 ] do # echo -E -- "$1" | tr "\\" "~" | sed "s/ \/\([a-zA-Z0-9]*\)/ -\1/g" | tr "~" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" - echo -E -- "$1" | tr "\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" + echo -E -- "$1" | tr "\\\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" echo -n " " shift done @@ -24,7 +24,7 @@ function fix_args() { - ARGS=`fix_args1 $@` + ARGS=`fix_args1 ${@}` ARGS=`eval echo -- $ARGS | sed "s/^-- //g"` echo "$ARGS" } @@ -41,8 +41,9 @@ function copy() { + echo '"Copy: '${@}'"' debug "Copy: `which cp` `fix_args "$@"`" - `which cp` `fix_args "$@"` + `which cp` `fix_args "${@}"` } function md() diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index c820874..2820549 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 2624038..0a969cc 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 52546f5..0fb2026 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/dos.inc b/applications/Photoframe/dos.inc index e062ce6..60b3639 100755 --- a/applications/Photoframe/dos.inc +++ b/applications/Photoframe/dos.inc @@ -15,7 +15,7 @@ while [ $# -ne 0 ] do # echo -E -- "$1" | tr "\\" "~" | sed "s/ \/\([a-zA-Z0-9]*\)/ -\1/g" | tr "~" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" - echo -E -- "$1" | tr "\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" + echo -E -- "$1" | tr "\\\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" echo -n " " shift done @@ -24,7 +24,7 @@ function fix_args() { - ARGS=`fix_args1 $@` + ARGS=`fix_args1 ${@}` ARGS=`eval echo -- $ARGS | sed "s/^-- //g"` echo "$ARGS" } @@ -41,8 +41,9 @@ function copy() { + echo '"Copy: '${@}'"' debug "Copy: `which cp` `fix_args "$@"`" - `which cp` `fix_args "$@"` + `which cp` `fix_args "${@}"` } function md() diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index c820874..2820549 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 2624038..0a969cc 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 52546f5..0fb2026 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Korean.ts b/applications/Photoframe/i18n/DPF_Korean.ts index f86b048..70bfc97 100755 --- a/applications/Photoframe/i18n/DPF_Korean.ts +++ b/applications/Photoframe/i18n/DPF_Korean.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/dos.inc b/applications/Photoframe/dos.inc index e062ce6..60b3639 100755 --- a/applications/Photoframe/dos.inc +++ b/applications/Photoframe/dos.inc @@ -15,7 +15,7 @@ while [ $# -ne 0 ] do # echo -E -- "$1" | tr "\\" "~" | sed "s/ \/\([a-zA-Z0-9]*\)/ -\1/g" | tr "~" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" - echo -E -- "$1" | tr "\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" + echo -E -- "$1" | tr "\\\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" echo -n " " shift done @@ -24,7 +24,7 @@ function fix_args() { - ARGS=`fix_args1 $@` + ARGS=`fix_args1 ${@}` ARGS=`eval echo -- $ARGS | sed "s/^-- //g"` echo "$ARGS" } @@ -41,8 +41,9 @@ function copy() { + echo '"Copy: '${@}'"' debug "Copy: `which cp` `fix_args "$@"`" - `which cp` `fix_args "$@"` + `which cp` `fix_args "${@}"` } function md() diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index c820874..2820549 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 2624038..0a969cc 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 52546f5..0fb2026 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Korean.ts b/applications/Photoframe/i18n/DPF_Korean.ts index f86b048..70bfc97 100755 --- a/applications/Photoframe/i18n/DPF_Korean.ts +++ b/applications/Photoframe/i18n/DPF_Korean.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/libexif/libexif.pro b/applications/Photoframe/libexif/libexif.pro index 0a82c69..39fa931 100755 --- a/applications/Photoframe/libexif/libexif.pro +++ b/applications/Photoframe/libexif/libexif.pro @@ -1,5 +1,6 @@ TEMPLATE = lib TARGET = exif +DEFINES += _CRT_SECURE_NO_WARNINGS M_PI=3.14 ssize_t=int SOURCES += libexif/exif-utils.c \ libexif/exif-byte-order.c \ libexif/exif-content.c \ diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/dos.inc b/applications/Photoframe/dos.inc index e062ce6..60b3639 100755 --- a/applications/Photoframe/dos.inc +++ b/applications/Photoframe/dos.inc @@ -15,7 +15,7 @@ while [ $# -ne 0 ] do # echo -E -- "$1" | tr "\\" "~" | sed "s/ \/\([a-zA-Z0-9]*\)/ -\1/g" | tr "~" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" - echo -E -- "$1" | tr "\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" + echo -E -- "$1" | tr "\\\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" echo -n " " shift done @@ -24,7 +24,7 @@ function fix_args() { - ARGS=`fix_args1 $@` + ARGS=`fix_args1 ${@}` ARGS=`eval echo -- $ARGS | sed "s/^-- //g"` echo "$ARGS" } @@ -41,8 +41,9 @@ function copy() { + echo '"Copy: '${@}'"' debug "Copy: `which cp` `fix_args "$@"`" - `which cp` `fix_args "$@"` + `which cp` `fix_args "${@}"` } function md() diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index c820874..2820549 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 2624038..0a969cc 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 52546f5..0fb2026 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Korean.ts b/applications/Photoframe/i18n/DPF_Korean.ts index f86b048..70bfc97 100755 --- a/applications/Photoframe/i18n/DPF_Korean.ts +++ b/applications/Photoframe/i18n/DPF_Korean.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/libexif/libexif.pro b/applications/Photoframe/libexif/libexif.pro index 0a82c69..39fa931 100755 --- a/applications/Photoframe/libexif/libexif.pro +++ b/applications/Photoframe/libexif/libexif.pro @@ -1,5 +1,6 @@ TEMPLATE = lib TARGET = exif +DEFINES += _CRT_SECURE_NO_WARNINGS M_PI=3.14 ssize_t=int SOURCES += libexif/exif-utils.c \ libexif/exif-byte-order.c \ libexif/exif-content.c \ diff --git a/applications/Photoframe/refresh-translations.bat b/applications/Photoframe/refresh-translations.bat deleted file mode 100755 index 20e8a4c..0000000 --- a/applications/Photoframe/refresh-translations.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -lupdate Photoframe.pro -lrelease Photoframe.pro - -pause - diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/dos.inc b/applications/Photoframe/dos.inc index e062ce6..60b3639 100755 --- a/applications/Photoframe/dos.inc +++ b/applications/Photoframe/dos.inc @@ -15,7 +15,7 @@ while [ $# -ne 0 ] do # echo -E -- "$1" | tr "\\" "~" | sed "s/ \/\([a-zA-Z0-9]*\)/ -\1/g" | tr "~" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" - echo -E -- "$1" | tr "\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" + echo -E -- "$1" | tr "\\\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" echo -n " " shift done @@ -24,7 +24,7 @@ function fix_args() { - ARGS=`fix_args1 $@` + ARGS=`fix_args1 ${@}` ARGS=`eval echo -- $ARGS | sed "s/^-- //g"` echo "$ARGS" } @@ -41,8 +41,9 @@ function copy() { + echo '"Copy: '${@}'"' debug "Copy: `which cp` `fix_args "$@"`" - `which cp` `fix_args "$@"` + `which cp` `fix_args "${@}"` } function md() diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index c820874..2820549 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 2624038..0a969cc 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 52546f5..0fb2026 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Korean.ts b/applications/Photoframe/i18n/DPF_Korean.ts index f86b048..70bfc97 100755 --- a/applications/Photoframe/i18n/DPF_Korean.ts +++ b/applications/Photoframe/i18n/DPF_Korean.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/libexif/libexif.pro b/applications/Photoframe/libexif/libexif.pro index 0a82c69..39fa931 100755 --- a/applications/Photoframe/libexif/libexif.pro +++ b/applications/Photoframe/libexif/libexif.pro @@ -1,5 +1,6 @@ TEMPLATE = lib TARGET = exif +DEFINES += _CRT_SECURE_NO_WARNINGS M_PI=3.14 ssize_t=int SOURCES += libexif/exif-utils.c \ libexif/exif-byte-order.c \ libexif/exif-content.c \ diff --git a/applications/Photoframe/refresh-translations.bat b/applications/Photoframe/refresh-translations.bat deleted file mode 100755 index 20e8a4c..0000000 --- a/applications/Photoframe/refresh-translations.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -lupdate Photoframe.pro -lrelease Photoframe.pro - -pause - diff --git a/applications/Photoframe/refresh-translations.sh b/applications/Photoframe/refresh-translations.sh new file mode 100644 index 0000000..09aa817 --- /dev/null +++ b/applications/Photoframe/refresh-translations.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +lupdate Photoframe.pro +lrelease Photoframe.pro diff --git a/applications/Photoframe/_env.bat b/applications/Photoframe/_env.bat new file mode 100644 index 0000000..ad50a47 --- /dev/null +++ b/applications/Photoframe/_env.bat @@ -0,0 +1,9 @@ +@echo off + +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +set QTDIR=C:\Users\John\Documents\Code\Qt-5.13.2\5.13.2\msvc2017_64 +set PATH=%QTDIR%\bin;%PATH% + +cmd + +pause diff --git a/applications/Photoframe/_env.sh b/applications/Photoframe/_env.sh new file mode 100644 index 0000000..39699de --- /dev/null +++ b/applications/Photoframe/_env.sh @@ -0,0 +1,6 @@ +@echo off + +export QTDIR=/usr/local/Trolltech/Qt-4.5.0 +export PATH=$QTDIR/bin:$PATH + +bash diff --git a/applications/Photoframe/build-all.bat b/applications/Photoframe/build-all.bat index db9e97e..7f67edb 100755 --- a/applications/Photoframe/build-all.bat +++ b/applications/Photoframe/build-all.bat @@ -1,13 +1,2 @@ @echo off -rem -rem Batch script to build Photoframe on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - - -cmd /C build-libexif.bat -qmake -cmd /C make -cmd /C refresh-translations.bat - +run-unix-script.bat build-all.sh diff --git a/applications/Photoframe/build-all.sh b/applications/Photoframe/build-all.sh index 1404575..3fbaccd 100755 --- a/applications/Photoframe/build-all.sh +++ b/applications/Photoframe/build-all.sh @@ -1,25 +1,15 @@ #!/bin/bash +# +# Script to build Photoframe +# By John Ryland +# InvertedLogic 2009-2021 +# -export QTDIR=/usr/local/Trolltech/Qt-4.5.0 -export PATH=$QTDIR/bin:$PATH -export PACKAGE=libexif-0.6.17 -cd libexif -unzip -n $PACKAGE.zip "$PACKAGE/libexif/*" -cd $PACKAGE -[ ! -f ./libexif.pro ] && cp ../libexif.pro ./ -[ ! -f ./config.h ] && cp ../config.h ./ +. build-libexif.sh + qmake make -mkdir -p ../../bin -cp libexif*.dylib ../../lib -cp libexif*.dylib ../../bin -mkdir -p ../../include/libexif -cp libexif/*.h ../../include/libexif -cd ../../ -qmake -make -lupdate -silent Photoframe.pro -lrelease -silent Photoframe.pro + +. refresh_translations.sh + cp config/dpf.ini ./ - - diff --git a/applications/Photoframe/build-libexif.bat b/applications/Photoframe/build-libexif.bat index cc2e578..3835462 100755 --- a/applications/Photoframe/build-libexif.bat +++ b/applications/Photoframe/build-libexif.bat @@ -1,32 +1,2 @@ @echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem - -echo -echo Unzip.exe command from: -echo http://www.patriot.net/users/bmcgin/unzip.exe -echo - -set PACKAGE=libexif-0.6.17 -cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% -qmake -cmd /C make -md ..\..\release - -copy release\libexif.a ..\..\lib -copy release\exif.dll ..\..\release - -copy release\liblibexif.a ..\..\lib -copy release\libexif.dll ..\..\lib -copy release\libexif.dll ..\..\release - -md ..\..\include\libexif\ -copy libexif\*.h ..\..\include\libexif -cd ..\.. +run-unix-script.bat build-libexif.sh diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 9e69fb4..c832ac2 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -1,33 +1,34 @@ #!/bin/bash -. ./dos.inc - -@echo off -rem -rem Batch script to build libexif on Windows -rem By John Ryland -rem InvertedLogic 2009 -rem +# +# Script to build libexif +# By John Ryland +# InvertedLogic 2009-2021 +# echo echo Unzip.exe command from: echo http://www.patriot.net/users/bmcgin/unzip.exe echo -set PACKAGE=libexif-0.6.17 +export PACKAGE=libexif-0.6.17 cd libexif -unzip -n %PACKAGE%.zip %PACKAGE%/libexif/* -copy libexif.pro %PACKAGE% -copy config.h %PACKAGE% -cd %PACKAGE% +unzip -n ${PACKAGE}.zip ${PACKAGE}/libexif/* +cp libexif.pro ${PACKAGE} +cp config.h ${PACKAGE} +cd ${PACKAGE} qmake -cmd /C make -md '..\..\release' -copy 'liblibexif.1.0.0.dylib' '..\..\lib' -copy 'liblibexif.1.0.0.dylib' '..\..\release' -copy 'release\liblibexif.a' '..\..\lib' -copy 'release\libexif.dll' '..\..\lib' -copy 'release\libexif.dll' '..\..\release' -md '..\..\include\libexif\' -copy 'libexif\*.h' '..\..\include\libexif' -cd '..\..' +make +mkdir -p ../../lib +mkdir -p ../../release +cp release/libexif*.dylib ../../lib +cp release/libexif*.dylib ../../bin +cp release/libexif.a ../../lib +cp release/exif.dll ../../release +cp release/liblibexif.a ../../lib +cp release/libexif.dll ../../lib +cp release/libexif.dll ../../release + +mkdir -p ../../include/libexif/ +cp libexif/*.h ../../include/libexif +cd ../.. diff --git a/applications/Photoframe/clean.bat b/applications/Photoframe/clean.bat index d10d341..d15a7d6 100755 --- a/applications/Photoframe/clean.bat +++ b/applications/Photoframe/clean.bat @@ -6,7 +6,9 @@ rem rmdir /s /q libexif\libexif-0.6.17 -rmdir /s /q include\libexif +rmdir /s /q include +rmdir /s /q bin +rmdir /s /q lib rmdir /s /q release rmdir /s /q debug del /q lib\*.* diff --git a/applications/Photoframe/dos.inc b/applications/Photoframe/dos.inc index e062ce6..60b3639 100755 --- a/applications/Photoframe/dos.inc +++ b/applications/Photoframe/dos.inc @@ -15,7 +15,7 @@ while [ $# -ne 0 ] do # echo -E -- "$1" | tr "\\" "~" | sed "s/ \/\([a-zA-Z0-9]*\)/ -\1/g" | tr "~" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" - echo -E -- "$1" | tr "\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" + echo -E -- "$1" | tr "\\\\" "/" | sed "s/^-- //g" | sed "s/%\([a-zA-Z0-9]*\)%/$\{\1\}/g" | tr -d "\n" echo -n " " shift done @@ -24,7 +24,7 @@ function fix_args() { - ARGS=`fix_args1 $@` + ARGS=`fix_args1 ${@}` ARGS=`eval echo -- $ARGS | sed "s/^-- //g"` echo "$ARGS" } @@ -41,8 +41,9 @@ function copy() { + echo '"Copy: '${@}'"' debug "Copy: `which cp` `fix_args "$@"`" - `which cp` `fix_args "$@"` + `which cp` `fix_args "${@}"` } function md() diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index c820874..2820549 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 2624038..0a969cc 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 52546f5..0fb2026 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/i18n/DPF_Korean.ts b/applications/Photoframe/i18n/DPF_Korean.ts index f86b048..70bfc97 100755 --- a/applications/Photoframe/i18n/DPF_Korean.ts +++ b/applications/Photoframe/i18n/DPF_Korean.ts @@ -1,6 +1,6 @@ - + DPF diff --git a/applications/Photoframe/libexif/libexif.pro b/applications/Photoframe/libexif/libexif.pro index 0a82c69..39fa931 100755 --- a/applications/Photoframe/libexif/libexif.pro +++ b/applications/Photoframe/libexif/libexif.pro @@ -1,5 +1,6 @@ TEMPLATE = lib TARGET = exif +DEFINES += _CRT_SECURE_NO_WARNINGS M_PI=3.14 ssize_t=int SOURCES += libexif/exif-utils.c \ libexif/exif-byte-order.c \ libexif/exif-content.c \ diff --git a/applications/Photoframe/refresh-translations.bat b/applications/Photoframe/refresh-translations.bat deleted file mode 100755 index 20e8a4c..0000000 --- a/applications/Photoframe/refresh-translations.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -lupdate Photoframe.pro -lrelease Photoframe.pro - -pause - diff --git a/applications/Photoframe/refresh-translations.sh b/applications/Photoframe/refresh-translations.sh new file mode 100644 index 0000000..09aa817 --- /dev/null +++ b/applications/Photoframe/refresh-translations.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +lupdate Photoframe.pro +lrelease Photoframe.pro diff --git a/applications/Photoframe/run-unix-script.bat b/applications/Photoframe/run-unix-script.bat new file mode 100644 index 0000000..13c638a --- /dev/null +++ b/applications/Photoframe/run-unix-script.bat @@ -0,0 +1,84 @@ +@echo off + +rem Process the file given on the command line +setlocal enabledelayedexpansion +for /f "tokens=1,*" %%a in ('type %1') do ( +set cmd=%%a +set line=%%b +call :_!cmd! !line! +) + +goto:_slash_convert_end +:_slash_convert +SET ARGS= +:loop +if not "%1"=="" ( + SET Z=%1 + SET Z=!Z:$=%%! + SET Z=!Z:{=! + SET Z=!Z:}=%%! + SET ARGS=%ARGS%!Z:/=\! + shift + goto :loop +) +rem echo.%CD%^> %ARGS% +call %ARGS% +goto:eof +:_slash_convert_end + +goto:cp_end +:_cp +call:_slash_convert copy %* && goto:eof +:cp_end + +goto:cd_end +:_cd +call:_slash_convert cd %* && goto:eof +:cd_end + +goto:mkdir_end +:_mkdir +if "%1"=="-p" shift +SET Z=%1 +SET Z=!Z:$=%%! +SET Z=!Z:{=! +SET Z=!Z:}=%%! +SET ARG=!Z:/=\! +if not exist %ARG% mkdir %ARG% +goto:eof +:mkdir_end + +goto:echo_end +:_echo +echo.%* && goto:eof +:echo_end + +goto:export_end +:_export +setlocal +SET F1=%1 +SET "!F1:/=\!" +endlocal +goto:eof +:export_end + +goto:unzip_end +:_unzip +call:_slash_convert unzip %* && goto:eof +:unzip_end + +goto:qmake_end +:_qmake +call:_slash_convert qmake %* && goto:eof +:qmake_end + +goto:make_end +:_make +call:_slash_convert nmake %* && goto:eof +:make_end + +rem Null commands +:_# +:_#/bin/bash +:_#!/bin/bash +goto:eof