Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
0d656d7189 | ||
|
aeb6789e39 | ||
|
6daf284859 | ||
|
d6b3a903a3 | ||
|
06138d2b82 | ||
|
e5407e621e | ||
|
d21b92593d | ||
|
f42ffa2591 |
1
.gitattributes
vendored
1
.gitattributes
vendored
@@ -17,3 +17,4 @@ installer/repository/de.ProjektManager.main/1.11.1networkinformation.7z.sha1 fil
|
||||
installer/repository/de.ProjektManager.main/1.11.1styles.7z filter=lfs diff=lfs merge=lfs -text
|
||||
installer/repository/de.ProjektManager.main/1.11.1imageformats.7z.sha1 filter=lfs diff=lfs merge=lfs -text
|
||||
installer/repository/de.ProjektManager.main/1.11.1networkinformation.7z filter=lfs diff=lfs merge=lfs -text
|
||||
installer/repository filter=lfs diff=lfs merge=lfs -text
|
||||
|
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Installer>
|
||||
<Name>ProjektManager</Name>
|
||||
<Version>1.10.3</Version>
|
||||
<Version>1.13.3</Version>
|
||||
<Title><Name>ProjektManager</Name> Installer</Title>
|
||||
<InstallerApplicationIcon>installerIcon1</InstallerApplicationIcon>
|
||||
<InstallerWindowIcon>installerIcon2</InstallerWindowIcon>
|
||||
@@ -13,7 +13,7 @@
|
||||
<MaintenanceToolName>ProjektManagerMaintenanceTool</MaintenanceToolName>
|
||||
<RemoteRepositories>
|
||||
<Repository>
|
||||
<Url>https://code.obermui.de/Markus/ProjektManager/raw/branch/main/installer/repository</Url>
|
||||
<Url>https://code.obermui.de/Markus/ProjektManagerC/media/branch/main/installer/repository</Url>
|
||||
<Enabled>1</Enabled>
|
||||
<DisplayName>Main-Repo</DisplayName>
|
||||
</Repository>
|
||||
|
Binary file not shown.
@@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Package>
|
||||
<DisplayName>ProjektManager 1.10.3</DisplayName>
|
||||
<DisplayName>ProjektManager 1.13.3</DisplayName>
|
||||
<Description>A Program to manage my Qt Projects</Description>
|
||||
<Version>1.10.3</Version>
|
||||
<Version>1.13.3</Version>
|
||||
<Default>true</Default>
|
||||
<ReleaseDate>2024-03-26</ReleaseDate>
|
||||
<ReleaseDate>2024-04-03</ReleaseDate>
|
||||
<Licenses>
|
||||
<License name="GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007" file="license.txt" />
|
||||
</Licenses>
|
||||
|
BIN
installer/repository/2024-04-02-2242_meta.7z
(Stored with Git LFS)
BIN
installer/repository/2024-04-02-2242_meta.7z
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/2024-04-03-0223_meta.7z
Normal file
BIN
installer/repository/2024-04-03-0223_meta.7z
Normal file
Binary file not shown.
27
installer/repository/Updates.xml
Normal file
27
installer/repository/Updates.xml
Normal file
@@ -0,0 +1,27 @@
|
||||
<Updates>
|
||||
<ApplicationName>{AnyApplication}</ApplicationName>
|
||||
<ApplicationVersion>1.0.0</ApplicationVersion>
|
||||
<Checksum>true</Checksum>
|
||||
<SHA1>6716e48a6901a36db364a41201d2c6b51458d65c</SHA1>
|
||||
<MetadataName>2024-04-03-0223_meta.7z</MetadataName>
|
||||
<PackageUpdate>
|
||||
<Name>de.ProjektManager.main</Name>
|
||||
<DisplayName>ProjektManager 1.13.2</DisplayName>
|
||||
<Description>A Program to manage my Qt Projects</Description>
|
||||
<Version>1.13.2</Version>
|
||||
<Default>true</Default>
|
||||
<ReleaseDate>2024-04-03</ReleaseDate>
|
||||
<Script>installscript.qs</Script>
|
||||
<UpdateFile OS="Any" CompressedSize="22198256" UncompressedSize="74658577"/>
|
||||
<DownloadableArchives>generic.7z,iconengines.7z,imageformats.7z,networkinformation.7z,platforms.7z,styles.7z,tls.7z,translations.7z,content.7z</DownloadableArchives>
|
||||
<Licenses>
|
||||
<License file="license.txt" name="GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007"/>
|
||||
</Licenses>
|
||||
<Operations>
|
||||
<Operation name="Extract">
|
||||
<Argument>@TargetDir@/bin/</Argument>
|
||||
</Operation>
|
||||
</Operations>
|
||||
<SHA1>b63bbaf71e88d129eda25304988378d5f3421847</SHA1>
|
||||
</PackageUpdate>
|
||||
</Updates>
|
BIN
installer/repository/de.ProjektManager.main/1.11.1generic.7z
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1generic.7z
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1generic.7z.sha1
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1generic.7z.sha1
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1iconengines.7z
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1iconengines.7z
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1iconengines.7z.sha1
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1iconengines.7z.sha1
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1imageformats.7z
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1imageformats.7z
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1imageformats.7z.sha1
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1imageformats.7z.sha1
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1networkinformation.7z
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1networkinformation.7z
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1networkinformation.7z.sha1
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1networkinformation.7z.sha1
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1platforms.7z
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1platforms.7z
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1platforms.7z.sha1
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1platforms.7z.sha1
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1styles.7z
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1styles.7z
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1styles.7z.sha1
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1styles.7z.sha1
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1tls.7z
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1tls.7z
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1tls.7z.sha1
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1tls.7z.sha1
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1translations.7z
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1translations.7z
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.11.1translations.7z.sha1
(Stored with Git LFS)
BIN
installer/repository/de.ProjektManager.main/1.11.1translations.7z.sha1
(Stored with Git LFS)
Binary file not shown.
BIN
installer/repository/de.ProjektManager.main/1.13.2content.7z
Normal file
BIN
installer/repository/de.ProjektManager.main/1.13.2content.7z
Normal file
Binary file not shown.
@@ -0,0 +1 @@
|
||||
26ad7b7c97ea91f1bccd2dc3a1a1e91f9eb817aa
|
BIN
installer/repository/de.ProjektManager.main/1.13.2generic.7z
Normal file
BIN
installer/repository/de.ProjektManager.main/1.13.2generic.7z
Normal file
Binary file not shown.
@@ -0,0 +1 @@
|
||||
0b5378d72be9ea9875daf333494821748c9c759c
|
BIN
installer/repository/de.ProjektManager.main/1.13.2iconengines.7z
Normal file
BIN
installer/repository/de.ProjektManager.main/1.13.2iconengines.7z
Normal file
Binary file not shown.
@@ -0,0 +1 @@
|
||||
acf2e2330ae44318507a5224bbb3a2adf550dc81
|
Binary file not shown.
@@ -0,0 +1 @@
|
||||
a9dd1479bbbeaf7a25acc4fd709d8fd6583c9c22
|
BIN
installer/repository/de.ProjektManager.main/1.13.2meta.7z
Normal file
BIN
installer/repository/de.ProjektManager.main/1.13.2meta.7z
Normal file
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
|
||||
bc20f654862b7f0ed2b98e0d0e979eecfa99f87a
|
BIN
installer/repository/de.ProjektManager.main/1.13.2platforms.7z
Normal file
BIN
installer/repository/de.ProjektManager.main/1.13.2platforms.7z
Normal file
Binary file not shown.
@@ -0,0 +1 @@
|
||||
5e26bb189a42e79c3e3f1ca6f158ed4dcd48d701
|
BIN
installer/repository/de.ProjektManager.main/1.13.2styles.7z
Normal file
BIN
installer/repository/de.ProjektManager.main/1.13.2styles.7z
Normal file
Binary file not shown.
@@ -0,0 +1 @@
|
||||
4aa497b1abc454271b92a3beeed428205d13ddec
|
BIN
installer/repository/de.ProjektManager.main/1.13.2tls.7z
Normal file
BIN
installer/repository/de.ProjektManager.main/1.13.2tls.7z
Normal file
Binary file not shown.
@@ -0,0 +1 @@
|
||||
f459db5980fefaff3e7e3e4b1843b7698fc932f4
|
Binary file not shown.
@@ -0,0 +1 @@
|
||||
4cf95b23871ff0085659457985123ed653b69f65
|
@@ -14,6 +14,10 @@ CreateUpdaterDialog::CreateUpdaterDialog(ProjektData *data, QWidget *parent)
|
||||
ui->lineEditVersion->setText(data->getAppVersion());
|
||||
ui->checkBox_githochladen->setChecked(data->shouldSetRemoteRepo());
|
||||
ui->checkBox_githochladen->setEnabled(data->shouldSetRemoteRepo());
|
||||
|
||||
ui->checkBox_CommitAndPushUpdaterRepo->setChecked(data->shouldSetRemoteRepo());
|
||||
ui->checkBox_CommitAndPushUpdaterRepo->setEnabled(data->shouldSetRemoteRepo());
|
||||
|
||||
ui->lineEditCommitMessage->setText("v" + data->getAppVersion());
|
||||
|
||||
}
|
||||
|
@@ -242,8 +242,8 @@ void MainWindow::closeEvent(QCloseEvent *event)
|
||||
{
|
||||
QMessageBox msgBox(QMessageBox::Question, "Bestätigung", "Was möchten Sie tun?", QMessageBox::NoButton, this);
|
||||
QPushButton* aboardButton = msgBox.addButton("Abbrechen", QMessageBox::ActionRole);
|
||||
QPushButton* hideButton = msgBox.addButton("Fenster verstecken", QMessageBox::ActionRole);
|
||||
QPushButton* exitButton = msgBox.addButton("Programm beenden", QMessageBox::RejectRole);
|
||||
QPushButton* hideButton = msgBox.addButton("Fenster verstecken", QMessageBox::ActionRole);
|
||||
|
||||
msgBox.setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
|
||||
msgBox.exec();
|
||||
|
@@ -66,7 +66,7 @@ private:
|
||||
StatisticsDialog * statDialog;
|
||||
|
||||
|
||||
QString version = "1.11.1";
|
||||
QString version = "1.13.3";
|
||||
QString appName = "ProjektManager";
|
||||
|
||||
|
||||
|
@@ -97,6 +97,10 @@ void NewProjektDialog::loadSettingsFromProjektData(ProjektData *projektData) {
|
||||
|
||||
ui->plainTextEditInitText->setPlainText(projektData->getReadme_init_text());
|
||||
ui->checkBoxOverwriteReadme->setChecked(projektData->getGit_overwriteReadmeFile());
|
||||
|
||||
ui->checkBoxgitlfs->setChecked(projektData->getGit_lfs());
|
||||
|
||||
|
||||
this->id = projektData->getId();
|
||||
}
|
||||
|
||||
@@ -146,6 +150,9 @@ ProjektData *NewProjektDialog::getProjektStruct(ProjektDataList *projektDataPare
|
||||
|
||||
bool qt_installer_start_after_install = ui->checkBoxstartafterInstall->isChecked();
|
||||
|
||||
bool git_lfs = ui->checkBoxgitlfs->isChecked();
|
||||
|
||||
|
||||
QString lineEditVersionFile = ui->lineEditVersionFile->text();
|
||||
|
||||
|
||||
@@ -157,7 +164,8 @@ ProjektData *NewProjektDialog::getProjektStruct(ProjektDataList *projektDataPare
|
||||
qt_installer_gpl3_licence, qt_m_updater_lib, qt_remove_shadow_build_setting,
|
||||
qt_move_files_to_src_sub_dir, qt_app_icon, qt_installer_start_after_install, qt_app_icon_path,
|
||||
git_init, git_enable_daily_auto_commit, git_init_readme, git_add_git_ignore,
|
||||
git_set_remote_repo, remote_repo_url, qt_installer, readmeinittext, git_overwriteReadmeFile, lineEditVersionFile);
|
||||
git_set_remote_repo, remote_repo_url, qt_installer, readmeinittext, git_overwriteReadmeFile, lineEditVersionFile,
|
||||
git_lfs);
|
||||
|
||||
|
||||
projektData->setParentList(projektDataParent);
|
||||
@@ -269,7 +277,7 @@ void NewProjektDialog::checkIfNeccessaryFieldAreFilled()
|
||||
username = qgetenv("USERNAME");
|
||||
|
||||
if(ui->lineEdit_qt_online_repo_url->text().isEmpty())
|
||||
ui->lineEdit_qt_online_repo_url->setText("https://code.obermui.de/" + username + "/" + name + "/raw/branch/main/installer/repository");
|
||||
ui->lineEdit_qt_online_repo_url->setText("https://code.obermui.de/" + username + "/" + name + "/media/branch/main/installer/repository");
|
||||
|
||||
if(ui->lineEdit_qt_publisher->text().isEmpty())
|
||||
ui->lineEdit_qt_publisher->setText(username);
|
||||
|
@@ -76,8 +76,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>536</width>
|
||||
<height>437</height>
|
||||
<width>199</width>
|
||||
<height>288</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
@@ -301,8 +301,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>536</width>
|
||||
<height>383</height>
|
||||
<width>292</width>
|
||||
<height>316</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout_5">
|
||||
@@ -622,7 +622,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>522</width>
|
||||
<width>263</width>
|
||||
<height>607</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -993,8 +993,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>536</width>
|
||||
<height>383</height>
|
||||
<width>522</width>
|
||||
<height>397</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
@@ -1122,6 +1122,13 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0" colspan="2">
|
||||
<widget class="QCheckBox" name="checkBoxgitlfs">
|
||||
<property name="text">
|
||||
<string>Git LFS für online updater Repository</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
@@ -26,7 +26,7 @@ ProjektData::ProjektData(QString name, QString path, size_t id, QString qt_insta
|
||||
bool qt_installer_desktop_link, bool qt_installer_gpl3_licence, bool qt_m_updater_lib, bool qt_remove_shadow_build_setting,
|
||||
bool qt_move_files_to_src_sub_dir, bool qt_app_icon, bool qt_installer_start_after_install, QString qt_app_icon_path, bool git_init,
|
||||
bool git_enable_daily_auto_commit, bool git_init_readme, bool git_add_git_ignore,
|
||||
bool git_set_remote_repo, QString remote_repo_url, bool qt_installer, QString readme_init_text, bool git_overwriteReadmeFile, QString qt_installer_versionFile, QString version) :
|
||||
bool git_set_remote_repo, QString remote_repo_url, bool qt_installer, QString readme_init_text, bool git_overwriteReadmeFile, QString qt_installer_versionFile, bool gitlfs, QString version) :
|
||||
magicNumber(MAGIC_NUM),
|
||||
data_version(version),
|
||||
parentList(nullptr),
|
||||
@@ -61,7 +61,8 @@ ProjektData::ProjektData(QString name, QString path, size_t id, QString qt_insta
|
||||
git_set_remote_repo(git_set_remote_repo),
|
||||
remote_repo_url(remote_repo_url),
|
||||
readme_init_text(readme_init_text),
|
||||
git_overwriteReadmeFile(git_overwriteReadmeFile)
|
||||
git_overwriteReadmeFile(git_overwriteReadmeFile),
|
||||
git_lfs(gitlfs)
|
||||
{
|
||||
qDebug() << " ProjektData()";
|
||||
|
||||
@@ -374,6 +375,11 @@ QString ProjektData::getQt_installer_versionFile() const
|
||||
return qt_installer_versionFile;
|
||||
}
|
||||
|
||||
bool ProjektData::getGit_lfs() const
|
||||
{
|
||||
return git_lfs;
|
||||
}
|
||||
|
||||
|
||||
ProjektDataList::~ProjektDataList()
|
||||
{
|
||||
|
@@ -11,7 +11,7 @@
|
||||
class ProjektDataList;
|
||||
|
||||
|
||||
#define DATA_VERSION QString("1.3.0")
|
||||
#define DATA_VERSION QString("1.4.0")
|
||||
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ public:
|
||||
QString qt_app_icon_path, bool git_init, bool git_enable_daily_auto_commit,
|
||||
bool git_init_readme, bool git_add_git_ignore, bool git_set_remote_repo,
|
||||
QString remote_repo_url, bool qt_installer, QString readme_init_text,
|
||||
bool git_overwriteReadmeFile, QString qt_installer_versionFile,
|
||||
bool git_overwriteReadmeFile, QString qt_installer_versionFile, bool gitlfs,
|
||||
QString version = DATA_VERSION);
|
||||
|
||||
friend QDataStream &operator<<(QDataStream &out, const ProjektData &obj) {
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
<< obj.qt_move_files_to_src_sub_dir << obj.qt_app_icon << obj.qt_installer_start_after_install
|
||||
<< obj.qt_app_icon_path << obj.git_init << obj.git_enable_daily_auto_commit << obj.git_init_readme
|
||||
<< obj.git_add_git_ignore << obj.git_set_remote_repo << obj.remote_repo_url << obj.qt_installer << obj.readme_init_text
|
||||
<< obj.git_overwriteReadmeFile << obj.qt_installer_versionFile;
|
||||
<< obj.git_overwriteReadmeFile << obj.git_lfs << obj.qt_installer_versionFile;
|
||||
|
||||
return out;
|
||||
}
|
||||
@@ -66,12 +66,12 @@ public:
|
||||
>> obj.qt_move_files_to_src_sub_dir >> obj.qt_app_icon >> obj.qt_installer_start_after_install
|
||||
>> obj.qt_app_icon_path >> obj.git_init >> obj.git_enable_daily_auto_commit >> obj.git_init_readme
|
||||
>> obj.git_add_git_ignore >> obj.git_set_remote_repo >> obj.remote_repo_url >> obj.qt_installer
|
||||
>> obj.readme_init_text >> obj.git_overwriteReadmeFile >> obj.qt_installer_versionFile;
|
||||
>> obj.readme_init_text >> obj.git_overwriteReadmeFile >> obj.git_lfs >> obj.qt_installer_versionFile;
|
||||
|
||||
//Backwards Compatibility
|
||||
} else if(obj.data_version == "1.2.0") {
|
||||
} else if(obj.data_version == "1.3.0") {
|
||||
|
||||
qDebug() << "Convert Data from 1.1.0";
|
||||
qDebug() << "Convert Data from 1.3.0";
|
||||
|
||||
in >> obj.magicNumber;
|
||||
// Hier deserialisieren Sie alle zusätzlichen Datenmember
|
||||
@@ -84,7 +84,7 @@ public:
|
||||
>> obj.qt_move_files_to_src_sub_dir >> obj.qt_app_icon >> obj.qt_installer_start_after_install
|
||||
>> obj.qt_app_icon_path >> obj.git_init >> obj.git_enable_daily_auto_commit >> obj.git_init_readme
|
||||
>> obj.git_add_git_ignore >> obj.git_set_remote_repo >> obj.remote_repo_url >> obj.qt_installer
|
||||
>> obj.readme_init_text >> obj.git_overwriteReadmeFile;
|
||||
>> obj.readme_init_text >> obj.git_overwriteReadmeFile >> obj.qt_installer_versionFile;
|
||||
|
||||
obj.git_overwriteReadmeFile = false; // init new values!
|
||||
|
||||
@@ -159,6 +159,8 @@ public:
|
||||
|
||||
QString getQt_installer_versionFile() const;
|
||||
|
||||
bool getGit_lfs() const;
|
||||
|
||||
private:
|
||||
|
||||
size_t magicNumber = -1;
|
||||
@@ -206,6 +208,7 @@ private:
|
||||
QString remote_repo_url;
|
||||
QString readme_init_text;
|
||||
bool git_overwriteReadmeFile;
|
||||
bool git_lfs;
|
||||
|
||||
};
|
||||
|
||||
|
@@ -156,7 +156,7 @@ void TaskManager::statusChanged(int value)
|
||||
|
||||
void TaskManager::newConsoleOutput(QString output)
|
||||
{
|
||||
this->ui->textEdit->append(output.replace("\n", "\n "));
|
||||
this->ui->textEdit->append(output.replace("\n\n", "\n").replace("\n", "\n ").replace(" > ", "\n > "));
|
||||
|
||||
}
|
||||
|
||||
@@ -731,7 +731,6 @@ bool Worker::createInstaller()
|
||||
process->start(gitExe, {"commit", "-m", extraData.commitMessage});
|
||||
if(process->waitForFinished(-1) && process->exitCode() > 1 /*1 == nothing to commit*/ ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
@@ -868,6 +867,7 @@ bool Worker::createInstaller()
|
||||
return false;
|
||||
|
||||
|
||||
|
||||
// push repo
|
||||
|
||||
if(extraData.commit_nad_push_u_repo) {
|
||||
@@ -885,16 +885,70 @@ bool Worker::createInstaller()
|
||||
return false;
|
||||
|
||||
|
||||
emit newOutput(" > git commit -m \"update repository to version " + extraData.newVersion +" --quiet\"");
|
||||
// setup git lfs
|
||||
if(data->getGit_lfs() && extraData.update_updater_repo) {
|
||||
emit newOutput(" > Add Repository to git lfs...");
|
||||
|
||||
QFile lfsfile(data->getProjectDirPath() + ".gitattributes");
|
||||
|
||||
if(!lfsfile.exists()) {
|
||||
emit newOutput(" !! ... Failed: Git lfs file doesn't exist!");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!lfsfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
emit newOutput(" !! ... Failed to open Git lfs file!");
|
||||
return false;
|
||||
}
|
||||
|
||||
QString gitlfsfile = lfsfile.readAll();
|
||||
lfsfile.close();
|
||||
|
||||
if(gitlfsfile.contains("installer/repository/")) {
|
||||
emit newOutput(" ... skip init lfs: already done!");
|
||||
} else {
|
||||
process->setWorkingDirectory(data->getProjectDirPath());
|
||||
emit newOutput(" > git lfs track installer/repository/*");
|
||||
process->start(gitExe, {"lfs", "track", "installer/repository/*"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0) {
|
||||
emit newOutput(" !! ...Failed: " + process->readAllStandardOutput() + process->readAllStandardError());
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
emit newOutput(" > git add .gitattributes installer/repository/*");
|
||||
process->start(gitExe, {"add", ".gitattributes"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
emit newOutput(" > git commit -m 'add git lfs'");
|
||||
process->start(gitExe, {"commit", "-m", "add git lfs files"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() > 1 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
process->setWorkingDirectory(data->getProjectDirPath() + "installer");
|
||||
}
|
||||
}
|
||||
|
||||
emit newOutput(" > git commit -m \"update repository to version " + extraData.newVersion);
|
||||
process->start(gitExe, {"commit", "-m", "Update repository to version " + extraData.newVersion});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
if(process->waitForFinished(-1) && process->exitCode() > 1 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
emit newOutput(" > git push");
|
||||
process->start(gitExe, {"push"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
@@ -1166,66 +1220,95 @@ bool Worker::setupGit()
|
||||
silentProcess1->start(gitExe, {"-C", data->getProjectDirPath() , "status"});
|
||||
if(silentProcess1->waitForFinished(-1) && silentProcess1->exitCode() == 0) {
|
||||
emit newOutput(" > Skip git init -> A Repo already exists!");
|
||||
return false;
|
||||
|
||||
} else {
|
||||
// qDebug() << "GIT STATUS: " << silentProcess1->readAllStandardOutput();
|
||||
// qDebug() << "GIT STATUS ERROR: " << silentProcess1->readAllStandardError();
|
||||
// qDebug() << "GIT STATUS RETURN V: " << silentProcess1->exitCode();
|
||||
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
emit newOutput(" > git init");
|
||||
process->start(gitExe, {"init"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
|
||||
emit newOutput(" > git checkout -b main");
|
||||
process->start(gitExe, {"checkout", "-b", "main"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
emit newOutput(" > git add README.md");
|
||||
process->start(gitExe, {"add", "README.md"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
|
||||
emit newOutput(" > git commit -m add README");
|
||||
process->start(gitExe, {"commit", "-m", "add README"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
// GIT LFS
|
||||
if(data->getGit_lfs()) {
|
||||
emit newOutput(" > Set git lfs...");
|
||||
QFile lfsfile(data->getProjectDirPath() + ".gitattributes");
|
||||
if(!lfsfile.exists()) {
|
||||
if (!lfsfile.open(QIODevice::WriteOnly | QIODevice::Text)) {
|
||||
emit newOutput(" !! ... Failed to open git lfs file for writing");
|
||||
return false;
|
||||
}
|
||||
lfsfile.write("\n");
|
||||
lfsfile.close();
|
||||
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
emit newOutput(" > git add .gitattributes");
|
||||
process->start(gitExe, {"add", ".gitattributes"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
|
||||
emit newOutput(" > git init");
|
||||
process->start(gitExe, {"init"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
emit newOutput(" > git commit -m 'add git lfs'");
|
||||
process->start(gitExe, {"commit", "-m", "add git lfs"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() > 1 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
} else {
|
||||
emit newOutput(" ... skip init lfs: already done!");
|
||||
}
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
|
||||
emit newOutput(" > git checkout -b main");
|
||||
process->start(gitExe, {"checkout", "-b", "main"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
emit newOutput(" > git add README.md");
|
||||
process->start(gitExe, {"add", "README.md"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
|
||||
emit newOutput(" > git commit -m add README");
|
||||
process->start(gitExe, {"commit", "-m", "add README"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
//Git push
|
||||
|
||||
if(data->shouldSetRemoteRepo()) {
|
||||
|
||||
|
||||
|
||||
emit newOutput(" > Set git remote repo...");
|
||||
|
||||
//Check if git repo exists
|
||||
@@ -1237,56 +1320,57 @@ bool Worker::setupGit()
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
|
||||
silentProcess1->start(gitExe, {"-C", data->getProjectDirPath(), "config", "--get", "remote.origin.url"});
|
||||
silentProcess1->waitForFinished(-1);// && silentProcess1->exitCode();// != 0)
|
||||
// emit newOutput(" !! git config --get remote.origin.url failed!: " + silentProcess1->readAllStandardError());
|
||||
// break;
|
||||
// e.g. no origin upstream
|
||||
|
||||
|
||||
QString output = silentProcess1->readAllStandardOutput();
|
||||
int index = output.indexOf(".git");
|
||||
if (index != -1)
|
||||
output = output.left(index + 4); // Including the ".git" itself
|
||||
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
// int index = output.indexOf(".git");
|
||||
// if (index != -1)
|
||||
// output = output.left(index + 4); // Including the ".git" itself
|
||||
|
||||
// // Reguläre Ausdrücke zum Entfernen der Kommentare, des Textes vor @ und nach :
|
||||
// QRegularExpression regex("^(?:https?://|ssh://[^@]+@)?([^:/]+)(?:\\:\\d+)?/");
|
||||
// output.remove(regex);
|
||||
// QString currentstr = data->getRemoteRepoUrl();
|
||||
// currentstr.remove(regex);
|
||||
|
||||
// if(isInterruptionRequested())
|
||||
// return false;
|
||||
|
||||
qDebug() << output << " =?= " << data->getRemoteRepoUrl();
|
||||
if(output == data->getRemoteRepoUrl()) {
|
||||
// qDebug() << output << " =?= " << currentstr;
|
||||
if(!output.isEmpty()) {
|
||||
emit newOutput(" ... skip operation: remote url is alreay set");
|
||||
return false;
|
||||
} else {
|
||||
|
||||
emit newOutput(" > git remote add origin " + data->getRemoteRepoUrl());
|
||||
process->start(gitExe, {"remote", "add", "origin", data->getRemoteRepoUrl() });
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
emit newOutput(" > git push -u origin main");
|
||||
process->start(gitExe, {"push", "-u", "origin", "main"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
}
|
||||
|
||||
emit newOutput(" > git remote add origin " + data->getRemoteRepoUrl());
|
||||
process->start(gitExe, {"remote", "add", "origin", data->getRemoteRepoUrl() });
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
|
||||
|
||||
emit newOutput(" > git push -u origin main");
|
||||
process->start(gitExe, {"push", "-u", "origin", "main"});
|
||||
if(process->waitForFinished(-1) && process->exitCode() != 0 ) {
|
||||
emit newOutput(" ...failed!");
|
||||
return false;
|
||||
}
|
||||
|
||||
if(isInterruptionRequested())
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if(data->shouldAddGitIgnore()) {
|
||||
|
||||
emit newOutput(" > Add .gitignore File");
|
||||
|
Reference in New Issue
Block a user