From bdd13065c411ed91a4218c55ecc83579c2e050c7 Mon Sep 17 00:00:00 2001 From: Sour Date: Thu, 14 Jun 2018 01:05:49 -0400 Subject: [PATCH] Added AppVeyor builds for Windows & Linux --- GUI.NET/Dependencies/resources.ca.xml | 2 +- GUI.NET/Dependencies/resources.en.xml | 2 +- GUI.NET/Dependencies/resources.es.xml | 2 +- GUI.NET/Dependencies/resources.fr.xml | 2 +- GUI.NET/Dependencies/resources.ja.xml | 2 +- GUI.NET/Dependencies/resources.pt.xml | 2 +- GUI.NET/Dependencies/resources.ru.xml | 2 +- GUI.NET/Dependencies/resources.uk.xml | 2 +- GUI.NET/Forms/frmAbout.Designer.cs | 81 ++++++++++++++++++--------- GUI.NET/Forms/frmAbout.cs | 9 +++ GUI.NET/Forms/frmAbout.resx | 72 ++++++++++++------------ GUI.NET/Forms/frmMain.cs | 20 +++++-- Mesen.sln | 1 + README.md | 12 +++- 14 files changed, 136 insertions(+), 75 deletions(-) diff --git a/GUI.NET/Dependencies/resources.ca.xml b/GUI.NET/Dependencies/resources.ca.xml index 34ba16f7..5f37e4a9 100644 --- a/GUI.NET/Dependencies/resources.ca.xml +++ b/GUI.NET/Dependencies/resources.ca.xml @@ -517,7 +517,7 @@ © 2018 M. Bibaud (aka Sour) Lloc web: www.mesen.ca - Versió: 0.9.5 (Beta) + Versió: Si desitgeu col·laborar amb Mesen, si us plau, considereu fer un donatiu. Gràcies pel vostre suport. &D'acord diff --git a/GUI.NET/Dependencies/resources.en.xml b/GUI.NET/Dependencies/resources.en.xml index 201d0227..ccdd2cfa 100644 --- a/GUI.NET/Dependencies/resources.en.xml +++ b/GUI.NET/Dependencies/resources.en.xml @@ -528,7 +528,7 @@ © 2018 M. Bibaud (aka Sour) Website: www.mesen.ca - Version: 0.9.5 (Beta) + Version: If you want to support Mesen, please consider donating. Thank you for your support! &OK diff --git a/GUI.NET/Dependencies/resources.es.xml b/GUI.NET/Dependencies/resources.es.xml index a0022034..94d53aad 100644 --- a/GUI.NET/Dependencies/resources.es.xml +++ b/GUI.NET/Dependencies/resources.es.xml @@ -515,7 +515,7 @@ © 2018 M. Bibaud (aka Sour) Sitio web: www.mesen.ca - Versión: 0.9.5 (Beta) + Versión: Si deseas colaborar con Mesen, por favor considera hacer una donación. ¡Gracias por tu colaboración! &OK diff --git a/GUI.NET/Dependencies/resources.fr.xml b/GUI.NET/Dependencies/resources.fr.xml index e12224f0..17f5db28 100644 --- a/GUI.NET/Dependencies/resources.fr.xml +++ b/GUI.NET/Dependencies/resources.fr.xml @@ -527,7 +527,7 @@ © 2018 M. Bibaud (aka Sour) Site web: www.mesen.ca - Version: 0.9.5 (Beta) + Version: Si vous voulez supporter le développement de Mesen, vous pouvez faire une donation. Merci de votre support! &OK diff --git a/GUI.NET/Dependencies/resources.ja.xml b/GUI.NET/Dependencies/resources.ja.xml index a34dffc2..50d759b5 100644 --- a/GUI.NET/Dependencies/resources.ja.xml +++ b/GUI.NET/Dependencies/resources.ja.xml @@ -517,7 +517,7 @@ © 2018 M. Bibaud (aka Sour) サイト: www.mesen.ca - バージョン: 0.9.5 (ベータ版) + バージョン: 応援ありがとうございます！ &OK diff --git a/GUI.NET/Dependencies/resources.pt.xml b/GUI.NET/Dependencies/resources.pt.xml index 116162e9..cf1d0b27 100644 --- a/GUI.NET/Dependencies/resources.pt.xml +++ b/GUI.NET/Dependencies/resources.pt.xml @@ -513,7 +513,7 @@ © 2018 M. Bibaud (aka Sour) Site: www.mesen.ca - Versão: 0.9.5 (Beta) + Versão: Caso queira apoiar o Mesen, por favor, considere fazer uma doação ao projeto. Obrigado pelo seu apoio! &OK diff --git a/GUI.NET/Dependencies/resources.ru.xml b/GUI.NET/Dependencies/resources.ru.xml index 1e6dc413..093ee198 100644 --- a/GUI.NET/Dependencies/resources.ru.xml +++ b/GUI.NET/Dependencies/resources.ru.xml @@ -515,7 +515,7 @@ © 2018 M. Bibaud (aka Sour) Сайт: www.mesen.ca - Версия: 0.9.5 (Beta) + Версия: If you want to support Mesen, please consider donating. Thank you for your support! &OK diff --git a/GUI.NET/Dependencies/resources.uk.xml b/GUI.NET/Dependencies/resources.uk.xml index 5b0381c7..5d58e89c 100644 --- a/GUI.NET/Dependencies/resources.uk.xml +++ b/GUI.NET/Dependencies/resources.uk.xml @@ -515,7 +515,7 @@ © 2018 M. Bibaud (aka Sour) Сайт: www.mesen.ca - Версiя: 0.9.5 (Beta) + Версiя: Якщо ви хочете підтримати Mesen, будь ласка підтримайте. Дякую за вашу підтримку! &OK diff --git a/GUI.NET/Forms/frmAbout.Designer.cs b/GUI.NET/Forms/frmAbout.Designer.cs index 384278c2..a1593848 100644 --- a/GUI.NET/Forms/frmAbout.Designer.cs +++ b/GUI.NET/Forms/frmAbout.Designer.cs @@ -35,13 +35,16 @@ this.lblWebsite = new System.Windows.Forms.Label(); this.lblLink = new System.Windows.Forms.Label(); this.labelVersion = new System.Windows.Forms.Label(); - this.lblDonate = new System.Windows.Forms.Label(); - this.picDonate = new System.Windows.Forms.PictureBox(); this.okButton = new System.Windows.Forms.Button(); + this.picDonate = new System.Windows.Forms.PictureBox(); + this.lblDonate = new System.Windows.Forms.Label(); + this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); + this.lblMesenVersion = new System.Windows.Forms.Label(); this.tableLayoutPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).BeginInit(); this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picDonate)).BeginInit(); + this.flowLayoutPanel2.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel @@ -55,10 +58,10 @@ this.tableLayoutPanel.Controls.Add(this.labelProductName, 1, 0); this.tableLayoutPanel.Controls.Add(this.labelCopyright, 1, 2); this.tableLayoutPanel.Controls.Add(this.flowLayoutPanel1, 1, 3); - this.tableLayoutPanel.Controls.Add(this.labelVersion, 1, 1); this.tableLayoutPanel.Controls.Add(this.okButton, 1, 5); this.tableLayoutPanel.Controls.Add(this.picDonate, 0, 5); this.tableLayoutPanel.Controls.Add(this.lblDonate, 0, 4); + this.tableLayoutPanel.Controls.Add(this.flowLayoutPanel2, 1, 1); this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel.Location = new System.Drawing.Point(5, 5); this.tableLayoutPanel.Name = "tableLayoutPanel"; @@ -70,7 +73,6 @@ this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel.Size = new System.Drawing.Size(337, 134); this.tableLayoutPanel.TabIndex = 0; // @@ -103,7 +105,7 @@ // this.labelCopyright.Dock = System.Windows.Forms.DockStyle.Fill; this.labelCopyright.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelCopyright.Location = new System.Drawing.Point(90, 34); + this.labelCopyright.Location = new System.Drawing.Point(90, 35); this.labelCopyright.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0); this.labelCopyright.Name = "labelCopyright"; this.labelCopyright.Size = new System.Drawing.Size(244, 17); @@ -115,7 +117,7 @@ // this.flowLayoutPanel1.Controls.Add(this.lblWebsite); this.flowLayoutPanel1.Controls.Add(this.lblLink); - this.flowLayoutPanel1.Location = new System.Drawing.Point(84, 51); + this.flowLayoutPanel1.Location = new System.Drawing.Point(84, 52); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(236, 18); @@ -149,24 +151,25 @@ // // labelVersion // - this.labelVersion.Location = new System.Drawing.Point(90, 17); + this.labelVersion.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.labelVersion.AutoSize = true; + this.labelVersion.Location = new System.Drawing.Point(6, 0); this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0); this.labelVersion.Name = "labelVersion"; - this.labelVersion.Size = new System.Drawing.Size(146, 17); + this.labelVersion.Size = new System.Drawing.Size(45, 13); this.labelVersion.TabIndex = 0; - this.labelVersion.Text = "Version: 0.9.5 (Beta)"; + this.labelVersion.Text = "Version:"; this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // lblDonate + // okButton // - this.lblDonate.AutoSize = true; - this.tableLayoutPanel.SetColumnSpan(this.lblDonate, 2); - this.lblDonate.Location = new System.Drawing.Point(0, 75); - this.lblDonate.Margin = new System.Windows.Forms.Padding(0, 5, 0, 0); - this.lblDonate.Name = "lblDonate"; - this.lblDonate.Size = new System.Drawing.Size(271, 26); - this.lblDonate.TabIndex = 30; - this.lblDonate.Text = "If you want to support Mesen, please consider donating.\r\nThank you for your support!"; + this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.okButton.Location = new System.Drawing.Point(259, 104); + this.okButton.Name = "okButton"; + this.okButton.Size = new System.Drawing.Size(75, 23); + this.okButton.TabIndex = 24; + this.okButton.Text = "&OK"; // // picDonate // @@ -181,15 +184,37 @@ this.picDonate.TabStop = false; this.picDonate.Click += new System.EventHandler(this.picDonate_Click); // - // okButton + // lblDonate // - this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.okButton.Location = new System.Drawing.Point(259, 104); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 24; - this.okButton.Text = "&OK"; + this.lblDonate.AutoSize = true; + this.tableLayoutPanel.SetColumnSpan(this.lblDonate, 2); + this.lblDonate.Location = new System.Drawing.Point(0, 75); + this.lblDonate.Margin = new System.Windows.Forms.Padding(0, 5, 0, 0); + this.lblDonate.Name = "lblDonate"; + this.lblDonate.Size = new System.Drawing.Size(271, 26); + this.lblDonate.TabIndex = 30; + this.lblDonate.Text = "If you want to support Mesen, please consider donating.\r\nThank you for your suppo" + + "rt!"; + // + // flowLayoutPanel2 + // + this.flowLayoutPanel2.Controls.Add(this.labelVersion); + this.flowLayoutPanel2.Controls.Add(this.lblMesenVersion); + this.flowLayoutPanel2.Location = new System.Drawing.Point(84, 20); + this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0); + this.flowLayoutPanel2.Name = "flowLayoutPanel2"; + this.flowLayoutPanel2.Size = new System.Drawing.Size(200, 15); + this.flowLayoutPanel2.TabIndex = 31; + // + // lblMesenVersion + // + this.lblMesenVersion.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblMesenVersion.AutoSize = true; + this.lblMesenVersion.Location = new System.Drawing.Point(57, 0); + this.lblMesenVersion.Name = "lblMesenVersion"; + this.lblMesenVersion.Size = new System.Drawing.Size(53, 13); + this.lblMesenVersion.TabIndex = 1; + this.lblMesenVersion.Text = ""; // // frmAbout // @@ -215,6 +240,8 @@ this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.picDonate)).EndInit(); + this.flowLayoutPanel2.ResumeLayout(false); + this.flowLayoutPanel2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -233,5 +260,7 @@ private System.Windows.Forms.Button okButton; private System.Windows.Forms.PictureBox picDonate; private System.Windows.Forms.Label lblDonate; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; + private System.Windows.Forms.Label lblMesenVersion; } } diff --git a/GUI.NET/Forms/frmAbout.cs b/GUI.NET/Forms/frmAbout.cs index 37ddf329..98528b5c 100644 --- a/GUI.NET/Forms/frmAbout.cs +++ b/GUI.NET/Forms/frmAbout.cs @@ -15,6 +15,15 @@ namespace Mesen.GUI.Forms public frmAbout() { InitializeComponent(); + + lblMesenVersion.Text = InteropEmu.GetMesenVersion(); + +#if AUTOBUILD + string devVersion = ResourceManager.ReadZippedResource("DevBuild.txt"); + if(devVersion != null) { + lblMesenVersion.Text = devVersion; + } +#endif } private void lblLink_Click(object sender, EventArgs e) diff --git a/GUI.NET/Forms/frmAbout.resx b/GUI.NET/Forms/frmAbout.resx index cab5df30..7ff960cc 100644 --- a/GUI.NET/Forms/frmAbout.resx +++ b/GUI.NET/Forms/frmAbout.resx @@ -123,42 +123,42 @@ - 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 + lur5gpmZ/QdCEW0eU8qyCQAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/GUI.NET/Forms/frmMain.cs b/GUI.NET/Forms/frmMain.cs index a80e6e5c..f428a866 100644 --- a/GUI.NET/Forms/frmMain.cs +++ b/GUI.NET/Forms/frmMain.cs @@ -76,6 +76,18 @@ namespace Mesen.GUI.Forms _fonts.AddFontFile(Path.Combine(ConfigManager.HomeFolder, "Resources", "PixelFont.ttf")); lblVersion.Font = new Font(_fonts.Families[0], 11); +#if AUTOBUILD + string devVersion = ResourceManager.ReadZippedResource("DevBuild.txt"); + if(devVersion != null) { + Size versionSize = TextRenderer.MeasureText(devVersion, lblVersion.Font); + lblVersion.Text = devVersion; + lblVersion.Anchor = AnchorStyles.Left; + int newWidth = versionSize.Width + 30; + panelInfo.Left -= newWidth - panelInfo.Width; + panelInfo.Width = newWidth; + } +#endif + _commandLineArgs = (string[])args.Clone(); Application.AddMessageFilter(this); @@ -135,9 +147,9 @@ namespace Mesen.GUI.Forms base.OnLoad(e); - #if HIDETESTMENU +#if HIDETESTMENU mnuTests.Visible = false; - #endif +#endif _notifListener = new InteropEmu.NotificationListener(); _notifListener.OnNotification += _notifListener_OnNotification; @@ -1140,7 +1152,7 @@ namespace Mesen.GUI.Forms } } - #if !HIDETESTMENU +#if !HIDETESTMENU if(keyData == Keys.Pause) { if(InteropEmu.RomTestRecording()) { InteropEmu.RomTestStop(); @@ -1148,7 +1160,7 @@ namespace Mesen.GUI.Forms InteropEmu.RomTestRecord(ConfigManager.TestFolder + "\\" + InteropEmu.GetRomInfo().GetRomName() + ".mtp", true); } } - #endif +#endif return base.ProcessCmdKey(ref msg, keyData); } diff --git a/Mesen.sln b/Mesen.sln index 1bd47e76..313ae601 100644 --- a/Mesen.sln +++ b/Mesen.sln @@ -16,6 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utilities", "Utilities\Util EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GUI.NET", "GUI.NET\GUI.NET.csproj", "{08D83A7E-52A9-451E-A53A-1A7946F8BB77}" ProjectSection(ProjectDependencies) = postProject + {36ABBF1C-66E1-4577-828A-619A2EF0DAE9} = {36ABBF1C-66E1-4577-828A-619A2EF0DAE9} {AABB5225-3A49-47FF-8A48-031673CADCE9} = {AABB5225-3A49-47FF-8A48-031673CADCE9} {37749BB2-FA78-4EC9-8990-5628FC0BBA19} = {37749BB2-FA78-4EC9-8990-5628FC0BBA19} EndProjectSection diff --git a/README.md b/README.md index 0962419e..380d7eef 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,19 @@ If you want to support this project, please consider making a donation: [![Donate](https://www.mesen.ca/images/donate.png)](https://www.mesen.ca/Donate.php) -[Website (https://www.mesen.ca)](https://www.mesen.ca) +[Website (https://www.mesen.ca)](https://www.mesen.ca) [Documentation (https://www.mesen.ca/docs)](https://www.mesen.ca/docs) +## Development Builds + +Development builds of the latest commit are available from Appveyor. For stable release builds, see the **Releases** section below. + +**Warning:** These are development builds and may be ***unstable***. Using them may also increase the chances of your settings being corrupted, or having issues when upgrading to the next official release. Additionally, these builds are currently not optimized via PGO and will typically run 20-30% slower than the official release builds. + +Windows: [![Build status](https://ci.appveyor.com/api/projects/status/d4i7rqbfi386wdyw/branch/master?svg=true)](https://ci.appveyor.com/project/Sour/mesen/build/artifacts) + +Linux: [![Build status](https://ci.appveyor.com/api/projects/status/uuoxwu7o5kkqjp4e/branch/master?svg=true)](https://ci.appveyor.com/project/Sour/mesen-nyf7v/build/artifacts) + ## Releases ### Windows