From 3565aad630864ecdbe53fdaa501ea708555b3c7c Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sun, 30 Apr 2023 18:30:36 -0400 Subject: New upstream version 3.4.4+dfsg. --- scripts/installer/assemble.tcl | 422 ----------------------------- scripts/installer/config/bg.png | Bin 218806 -> 0 bytes scripts/installer/config/config.xml | 27 -- scripts/installer/config/controller.qs | 5 - scripts/installer/config/logo.png | Bin 3980 -> 0 bytes scripts/installer/config/sqlitestudio.icns | Bin 287952 -> 0 bytes scripts/installer/config/sqlitestudio.ico | Bin 297966 -> 0 bytes scripts/installer/config/watermark.png | Bin 218806 -> 0 bytes scripts/macosx/compile_build_bundle.sh | 30 +- 9 files changed, 15 insertions(+), 469 deletions(-) delete mode 100644 scripts/installer/assemble.tcl delete mode 100644 scripts/installer/config/bg.png delete mode 100644 scripts/installer/config/config.xml delete mode 100644 scripts/installer/config/controller.qs delete mode 100644 scripts/installer/config/logo.png delete mode 100644 scripts/installer/config/sqlitestudio.icns delete mode 100644 scripts/installer/config/sqlitestudio.ico delete mode 100644 scripts/installer/config/watermark.png (limited to 'scripts') diff --git a/scripts/installer/assemble.tcl b/scripts/installer/assemble.tcl deleted file mode 100644 index bb343f8..0000000 --- a/scripts/installer/assemble.tcl +++ /dev/null @@ -1,422 +0,0 @@ -#!/usr/bin/env tclsh - -# tclsh assemble.tcl c:/tmp/installer [--repo] - -package require platform -lassign [split [platform::generic] -] OS ARCH - -set cfgFiles { - config.xml - bg.png - logo.png - sqlitestudio.icns - sqlitestudio.ico - watermark.png - controller.qs -} - -switch $::OS { - "macosx" { - set mainPkgFiles { - SQLiteStudio.app/Contents/Frameworks/libcoreSQLiteStudio.1.0.0.dylib - SQLiteStudio.app/Contents/Frameworks/libguiSQLiteStudio.1.0.0.dylib - SQLiteStudio.app/Contents/Frameworks/libsqlite3.0.dylib - SQLiteStudio.app/Contents/MacOS/SQLiteStudio - SQLiteStudio.app/Contents/MacOS/sqlitestudiocli - SQLiteStudio.app/Contents/Resources - SQLiteStudio.app/Contents/Info.plist - SQLiteStudio.app/Contents/PkgInfo - } - set qtPkgFiles { - SQLiteStudio.app/Contents/Frameworks/QtCore.framework - SQLiteStudio.app/Contents/Frameworks/QtGui.framework - SQLiteStudio.app/Contents/Frameworks/QtNetwork.framework - SQLiteStudio.app/Contents/Frameworks/QtPrintSupport.framework - SQLiteStudio.app/Contents/Frameworks/QtScript.framework - SQLiteStudio.app/Contents/Frameworks/QtSvg.framework - SQLiteStudio.app/Contents/Frameworks/QtWidgets.framework - SQLiteStudio.app/Contents/Frameworks/QtXml.framework - SQLiteStudio.app/Contents/PlugIns/bearer - SQLiteStudio.app/Contents/PlugIns/iconengines - SQLiteStudio.app/Contents/PlugIns/imageformats - SQLiteStudio.app/Contents/PlugIns/platforms - SQLiteStudio.app/Contents/PlugIns/printsupport - SQLiteStudio.app/Contents/PlugIns/styles - } - array set pluginDeps { - } - } - "win32" { - set mainPkgFiles { - coreSQLiteStudio.dll - guiSQLiteStudio.dll - sqlite3.dll - SQLiteStudio.exe - sqlitestudiocli.exe - } - set qtPkgFiles { - iconengines - imageformats - platforms - printsupport - styles - libeay32.dll - libgcc_s_dw2-1.dll - libstdc++-6.dll - libwinpthread-1.dll - qt.conf - Qt5Core.dll - Qt5Gui.dll - Qt5Network.dll - Qt5PrintSupport.dll - Qt5Script.dll - Qt5Svg.dll - Qt5Widgets.dll - Qt5Xml.dll - } - array set pluginDeps { - ScriptingTcl { - tcl86.dll - zlib1.dll - } - DbSqlite2 { - sqlite.dll - } - } - } - default { - set mainPkgFiles { - lib/libcoreSQLiteStudio.so - lib/libguiSQLiteStudio.so - lib/libsqlite3.so - sqlitestudio - sqlitestudiocli - } - set qtPkgFiles { - iconengines/libqsvgicon.so - imageformats/libqgif.so - imageformats/libqicns.so - imageformats/libqico.so - imageformats/ibqjpeg.so - imageformats/libqsvg.so - imageformats/libqtga.so - imageformats/libqtiff.so - platforms/libqxcb.so - printsupport/libcupsprintersupport.so - lib/libQt5Concurrent.so - lib/libQt5Core.so - lib/libQt5DBus.so - lib/libQt5Gui.so - lib/libQt5Network.so - lib/libQt5PrintSupport.so - lib/libQt5Script.so - lib/libQt5Svg.so - lib/libQt5Widgets.so - lib/libQt5XcbQpa.so - lib/libQt5Xml.so - lib/libicudata.so - lib/libicui18n.so - lib/libicuuc.so.56 - } - array set pluginDeps { - DbSqlite2 { - lib/libsqlite.so - } - } - } -} - -proc defineGlobalVars {} { - lassign $::argv ::targetDir - set ::releaseDate [clock format [clock seconds] -format "%Y-%m-%d"] - - # Version - set verFile "../../SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp" - set fd [open $verFile r] - set ver [lindex [regexp -inline {int\s+sqlitestudioVersion\s*\=\s*(\d+)} [read $fd]] 1] - ######################################################################################### VER +1 - #incr ver - set ::sqliteStudioVersion [toVersion $ver] - set data [read $fd] - close $fd - - switch $::OS { - "macosx" { - set ::portableDir [file normalize ../../output] - set ::finalExecutable "Contents/MacOS/SQLiteStudio" - set ::wizardStyle "Mac" - set ::initialTargetDir "/Applications/SQLiteStudio.app" - set ::libExt "dylib" - set ::updateArch "macosx" - set ::pluginsDir "SQLiteStudio.app/Contents/PlugIns" - set ::libPref "lib" - set ::dirsToSkipInPathBeginning 1 - set qtCoreFile "$::portableDir/SQLiteStudio/SQLiteStudio.app/Contents/Frameworks/QtCore.framework/QtCore" - set ::output [file normalize $::targetDir/InstallSQLiteStudio-${::sqliteStudioVersion}] - } - "win32" { - set ::portableDir [file normalize ../../output/portable] - set ::finalExecutable "SQLiteStudio.exe" - set ::wizardStyle "Modern" - set ::initialTargetDir "C:\\Program Files\\SQLiteStudio" - set ::libExt "dll" - set ::updateArch "windows" - set ::pluginsDir "plugins" - set ::libPref "" - set ::dirsToSkipInPathBeginning 0 - set qtCoreFile "$::portableDir/SQLiteStudio/Qt5Core.dll" - set ::output [file normalize $::targetDir/InstallSQLiteStudio-${::sqliteStudioVersion}.exe] - } - default { - set ::portableDir [file normalize ../../output/portable] - set ::finalExecutable "sqlitestudio" - set ::wizardStyle "Modern" - set ::initialTargetDir "/opt/SQLiteStudio" - set ::updateArch "linux" - set ::pluginsDir "plugins" - set ::libExt "so" - set ::libPref "lib" - set ::dirsToSkipInPathBeginning 0 - set qtCoreFile "$::portableDir/SQLiteStudio/lib/libQt5Core.so" - set ::output [file normalize $::targetDir/InstallSQLiteStudio-${::sqliteStudioVersion}] - } - } - - # Qt version - set fd [open $qtCoreFile r] - chan configure $fd -translation binary -encoding binary - set data [read $fd] - close $fd - set ::qtVer [lindex [regexp -inline -- {Qt\s+(\d\.\d{1,2}\.\d{1,2})} $data] 1] - ######################################################################################### VER +1 - #set ::qtVer 6.0.0 - - set ::startApp $::finalExecutable - - # Repository - set ::repoDir [file normalize $::targetDir/REPO] -} - -proc toVersion {ver} { - return [expr {$ver / 10000}].[expr {$ver / 100 % 100}].[expr {$ver % 100}] -} - -proc mapFile {f props} { - set fd [open $f r] - set data [read $fd] - close $fd - - set data [string map $props $data] - - set fd [open $f w+] - puts $fd $data - close $fd -} - -proc initDirs {targetDir} { - file delete -force $::output $::repoDir $targetDir - file mkdir $targetDir $targetDir/config $targetDir/packages -} - -proc archiveContentsOf {dir intoFile} { - set cdir [pwd] - cd $dir - set files [glob *] - exec archivegen $intoFile {*}$files - file delete -force {*}$files - cd $cdir -} - -proc copyFileWithLinks {fromDir toDir file} { - set targetFile [file join {*}[lrange [file split $file] $::dirsToSkipInPathBeginning end]] - file mkdir [file dirname $toDir/$targetFile] - switch -- $::OS { - "macosx" { - file copy -force $fromDir/$file $toDir/$targetFile - set fd [file dirname $fromDir/$file] - set td [file dirname $toDir/$targetFile] - set fileOnly [lindex [file split $file] end] - set filePrefix [lindex [split $fileOnly .] 0] - foreach f [glob -nocomplain -tails -directory $fd "${filePrefix}.*.$::libExt"] { - file copy -force $fd/$f $td/$f - } - } - "win32" { - file copy -force $fromDir/$file $toDir/$targetFile - } - default { - set fd [file dirname $fromDir/$file] - set td [file dirname $toDir/$targetFile] - set fileOnly [lindex [file split $file] end] - foreach f [glob -nocomplain -tails -directory $fd "${fileOnly}*"] { - file copy -force $fd/$f $td/$f - } - } - } -} - -proc copyMainPkg {targetDir} { - set pkgDir $targetDir/packages/pl.com.salsoft.sqlitestudio - - puts "Copying core app files." - file mkdir $pkgDir $pkgDir/meta $pkgDir/data - foreach f $::mainPkgFiles { - copyFileWithLinks $::portableDir/SQLiteStudio $pkgDir/data $f - } - file copy ../../SQLiteStudio3/sqlitestudio/package.xml ../../SQLiteStudio3/sqlitestudio/register_file_types.ui ../../SQLiteStudio3/sqlitestudio/installscript.qs $pkgDir/meta/ - - file mkdir $pkgDir/data/app_icon - file copy ../../SQLiteStudio3/guiSQLiteStudio/img/sqlitestudio.ico $pkgDir/data/app_icon - file copy ../../SQLiteStudio3/guiSQLiteStudio/img/sqlitestudio.icns $pkgDir/data/app_icon - file copy ../../SQLiteStudio3/guiSQLiteStudio/img/sqlitestudio.svg $pkgDir/data/app_icon - file copy ../../SQLiteStudio3/guiSQLiteStudio/img/sqlitestudio_logo.png $pkgDir/data/app_icon/sqlitestudio.png - - mapFile $pkgDir/meta/package.xml [list %VERSION% $::sqliteStudioVersion %DATE% $::releaseDate] - - puts "Compressing core app files." - archiveContentsOf $pkgDir/data sqlitestudio.7z -} - -proc copyQtPkg {targetDir} { - set pkgDir $targetDir/packages/io.qt - - puts "Copying Qt." - file mkdir $pkgDir $pkgDir/meta $pkgDir/data - foreach f $::qtPkgFiles { - copyFileWithLinks $::portableDir/SQLiteStudio $pkgDir/data $f - } - file copy ../../SQLiteStudio3/qt_package.xml $pkgDir/meta/package.xml - - mapFile $pkgDir/meta/package.xml [list %VERSION% $::qtVer %DATE% $::releaseDate] - - puts "Compressing Qt." - archiveContentsOf $pkgDir/data qt.7z -} - -proc copyConfig {targetDir} { - foreach f $::cfgFiles { - file copy config/$f $targetDir/config/ - } - - mapFile $targetDir/config/config.xml [list %SQLITESTUDIO_VERSION% $::sqliteStudioVersion %FINAL_EXECUTABLE% $::finalExecutable \ - %WIZARD_STYLE% $::wizardStyle %TARGET_DIR% $::initialTargetDir %UPDATE_ARCH% $::updateArch] -} - -proc createOutputBinary {targetDir} { - if {$::OS == "macosx"} { - puts "Creating installer binary: $::output.dmg" - exec binarycreator -f -p $targetDir/packages -c $targetDir/config/config.xml $::output.dmg - puts "Creating installer binary: $::output" - exec binarycreator -f -p $targetDir/packages -c $targetDir/config/config.xml $::output - } else { - puts "Creating installer binary: $::output" - exec binarycreator -f -p $targetDir/packages -c $targetDir/config/config.xml $::output - } -} - -proc createOutputRepo {targetDir} { - puts "Creating update repository: $::repoDir" - exec repogen -p $targetDir/packages $::repoDir -} - -proc readPluginVersion {path} { - set fd [open $path r] - set ver [lindex [regexp -inline -- {\"version\"\s*\:\s*(\d+)} [read $fd]] 1] - close $fd - return [toVersion $ver] -} - -proc collectPlugins {} { - set mask "*.$::libExt" - set toRemove [expr {[string length $mask] - 1}] - set prefToRemove [string length $::libPref] - - set files [glob -tails -directory $::portableDir/SQLiteStudio/$::pluginsDir $mask] - set ::plugins [list] - foreach f $files { - set plugin [string range $f $prefToRemove end-$toRemove] - set ver [readPluginVersion ../../Plugins/$plugin/[string tolower $plugin].json] - ######################################################################################### VER +1 - #set ver 9.9.9 - lappend ::plugins [dict create name $plugin version $ver] - } -} - -proc readPluginPkgName {path} { - set fd [open $path r] - set pkg [lindex [regexp -inline -- {\(.*)\<\/Name\>} [read $fd]] 1] - close $fd - return $pkg -} - -proc copyPluginPkg {pluginDict targetDir} { - set name [dict get $pluginDict name] - set ver [dict get $pluginDict version] - set packageXml ../../Plugins/$name/package.xml - - if {![file exists $packageXml]} { - puts "Skipping plugin $name, because package.xml for this plugin does not exist." - return - } - - set pkgName [readPluginPkgName $packageXml] - set pkgDir $targetDir/packages/$pkgName - - set targetPluginsDir [file join {*}[lrange [file split $::pluginsDir] $::dirsToSkipInPathBeginning end]] - - puts "Copying plugin: $name ($ver)" - file mkdir $pkgDir $pkgDir/meta $pkgDir/data $pkgDir/data/$targetPluginsDir - file copy -force $::portableDir/SQLiteStudio/$::pluginsDir/$::libPref${name}.$::libExt $pkgDir/data/$targetPluginsDir/ - if {[info exists ::pluginDeps($name)]} { - foreach f $::pluginDeps($name) { - copyFileWithLinks $::portableDir/SQLiteStudio $pkgDir/data $f - } - } - file copy $packageXml $pkgDir/meta/ - - mapFile $pkgDir/meta/package.xml [list %VERSION% $ver %DATE% $::releaseDate] - - puts "Compressing $name." - archiveContentsOf $pkgDir/data $name.7z -} - -proc copyPluginPkgs {targetDir} { - set packageXml ../../Plugins/package.xml - set pluginsPkg $targetDir/packages/pl.com.salsoft.sqlitestudio.plugins - file mkdir $pluginsPkg $pluginsPkg/data $pluginsPkg/meta - file copy $packageXml $pluginsPkg/meta/ - mapFile $pluginsPkg/meta/package.xml [list %DATE% $::releaseDate] - - foreach p $::plugins { - copyPluginPkg $p $targetDir - } -} - -if {$argc < 1 || $argc > 2} { - puts stderr "Usage: $argv0 \[--repo]" - exit 1 -} - -if {[catch {exec archivegen --help} res] && [string first "Usage: archivegen" $res] == -1} { - puts stderr "archivegen (QtIFW) missing in PATH." - exit 1 -} - -defineGlobalVars - -if {![file exists $::portableDir]} { - puts stderr "[file normalize $::portableDir] does not exist" - exit 1 -} - -collectPlugins -initDirs $targetDir -copyConfig $targetDir -copyMainPkg $targetDir -copyQtPkg $targetDir -copyPluginPkgs $targetDir -createOutputBinary $targetDir - -if {$argc >= 2 && [lindex $argv 1] == "--repo"} { - createOutputRepo $targetDir -} diff --git a/scripts/installer/config/bg.png b/scripts/installer/config/bg.png deleted file mode 100644 index 9140aa2..0000000 Binary files a/scripts/installer/config/bg.png and /dev/null differ diff --git a/scripts/installer/config/config.xml b/scripts/installer/config/config.xml deleted file mode 100644 index f52ba25..0000000 --- a/scripts/installer/config/config.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - SQLiteStudio - %SQLITESTUDIO_VERSION% - SQLiteStudio Setup - SalSoft - http://sqlitestudio.pl - sqlitestudio - sqlitestudio - logo.png - bg.png - @TargetDir@/%FINAL_EXECUTABLE% - - - Run SQLiteStudio - SQLiteStudio - UpdateSQLiteStudio - true - %WIZARD_STYLE% - %TARGET_DIR% - controller.qs - - - http://sqlitestudio.pl/update-repo/%UPDATE_ARCH%/ - - - \ No newline at end of file diff --git a/scripts/installer/config/controller.qs b/scripts/installer/config/controller.qs deleted file mode 100644 index 839c499..0000000 --- a/scripts/installer/config/controller.qs +++ /dev/null @@ -1,5 +0,0 @@ -function Controller() { - if (installer.isInstaller()) { - installer.setDefaultPageVisible(QInstaller.StartMenuSelection, false); - } -} diff --git a/scripts/installer/config/logo.png b/scripts/installer/config/logo.png deleted file mode 100644 index f125df8..0000000 Binary files a/scripts/installer/config/logo.png and /dev/null differ diff --git a/scripts/installer/config/sqlitestudio.icns b/scripts/installer/config/sqlitestudio.icns deleted file mode 100644 index 70ac0cd..0000000 Binary files a/scripts/installer/config/sqlitestudio.icns and /dev/null differ diff --git a/scripts/installer/config/sqlitestudio.ico b/scripts/installer/config/sqlitestudio.ico deleted file mode 100644 index 0aef62d..0000000 Binary files a/scripts/installer/config/sqlitestudio.ico and /dev/null differ diff --git a/scripts/installer/config/watermark.png b/scripts/installer/config/watermark.png deleted file mode 100644 index 9140aa2..0000000 Binary files a/scripts/installer/config/watermark.png and /dev/null differ diff --git a/scripts/macosx/compile_build_bundle.sh b/scripts/macosx/compile_build_bundle.sh index 0165ebb..86c2982 100755 --- a/scripts/macosx/compile_build_bundle.sh +++ b/scripts/macosx/compile_build_bundle.sh @@ -13,7 +13,7 @@ if [ "$1" == "" ]; then esac fi else - QMAKE=$1 + QMAKE="$1" fi realpath() { @@ -22,41 +22,41 @@ realpath() { cdir=`pwd` cpu_cores=`sysctl -n hw.logicalcpu` -absolute_path=`realpath $0` -this_dir=`dirname $absolute_path` -parent_dir=`dirname $this_dir` -parent_dir=`dirname $parent_dir` +absolute_path=`realpath "$0"` +this_dir=`dirname "$absolute_path"` +parent_dir=`dirname "$this_dir"` +parent_dir=`dirname "$parent_dir"` if [ "$2" == "" ]; then read -p "Number of CPU cores to use for compiling (hit enter to use $cpu_cores): " new_cpu_cores case $new_cpu_cores in "" ) break;; - * ) cpu_cores=$new_cpu_cores; break;; + * ) cpu_cores="$new_cpu_cores"; break;; esac else - cpu_cores=$2 + cpu_cores="$2" fi -if [ -d $parent_dir/output ]; then +if [ -d "$parent_dir/output" ]; then read -p "Directory $parent_dir/output already exists. The script will delete and recreate it. Is that okay? (y/N) : " yn - case $yn in - [Yy]* ) rm -rf $parent_dir/output; break;; + case "$yn" in + [Yy]* ) rm -rf "$parent_dir/output"; break;; * ) echo "Aborted."; exit;; esac fi -cd $parent_dir -mkdir output output/build output/build/Plugins +cd "$parent_dir" +mkdir -p output/build/Plugins cd output/build $QMAKE CONFIG+=portable ../../SQLiteStudio3 -make -j $cpu_cores +make -j "$cpu_cores" || exit 1 cd Plugins $QMAKE CONFIG+=portable ../../../Plugins -make -j $cpu_cores +make -j "$cpu_cores" || exit 1 cd .. make bundle -cd $cdir +cd "$cdir" -- cgit v1.2.3