diff --git a/.gitignore b/.gitignore index fe2ac70..8726e7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ *.snk *.pld +CopyReleasedFiles.js +ILRepack.targets +7za.exe misc/ ## Ignore Visual Studio temporary files, build results, and diff --git a/7za.exe b/7za.exe deleted file mode 100644 index 33196c2..0000000 Binary files a/7za.exe and /dev/null differ diff --git a/App/ILRepack.targets b/App/ILRepack.targets deleted file mode 100644 index d9c14c4..0000000 --- a/App/ILRepack.targets +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CopyReleasedFiles.js b/CopyReleasedFiles.js deleted file mode 100644 index 371f2f5..0000000 --- a/CopyReleasedFiles.js +++ /dev/null @@ -1,73 +0,0 @@ -var op = "m:\\"; // note: Be sure to change this for you, where compressed output file is copied to -var names = ["FreeImage.dll", "JBig2.dll", "mupdflib.dll", "PDFPatcher.exe", "PDFPatcher.exe.config", "授权协议.txt", "更新历史.txt"]; - -var n = WScript.Arguments(0); // assembly info file path -var p = WScript.Arguments(1); // bin path -var s = new ActiveXObject("ADODB.Stream"); - s.Open(); - s.Type = 2; - s.CharSet = "UTF-8"; // Make sure that the encoding is correct, otherwise damage may occur - s.LoadFromFile (n); -var t = s.ReadText (); - s.Close(); -var r = /\[assembly: AssemblyFileVersion\s*\("(\d+\.\d+\.\d+\.\d+)"\)\]/g; -var a = r.exec(t); -var v; -if (a != null && a.length > 1) { - v = a[1]; // Major.Minor.Build.Revision -} -else { - WScript.StdErr.WriteLine ("Error: AssemblyFileVersion not found."); - WScript.Quit (1); -} - -var sh = WScript.CreateObject ("WScript.Shell"); -sh.CurrentDirectory = p; - s.Open(); - s.Type = 2; - s.CharSet = "UTF-8"; - s.LoadFromFile ("更新历史.txt"); - t = s.ReadText (); - r = /\d+\.\d+\.\d+\.\d+ \d+年\d+月\d+日/; - s.Position = 0; - var d = new Date(); - var dt = d.getYear() + "年" + (d.getMonth()+1)+"月"+d.getDate()+"日"; - s.WriteText (t.replace(r, v + " " + dt)); - s.SetEOS (); - s.SaveToFile ("更新历史.txt", 2); - s.Close(); - - s.Open(); - s.Type = 2; - s.CharSet = "UTF-8"; - s.LoadFromFile ("更新历史.txt"); - t = s.ReadText (); - s.Position = 0; - s.SetEOS (); - s.WriteText (''); - s.WriteText (''); - s.SaveToFile (op + "pdfpatcher.update.xml", 2); - s.Close(); - -var c = "..\\..\\7za.exe u "+op+"PDFPatcher."+v+".7z "+names.join(" ") + " -mx9"; -WScript.StdOut.WriteLine (c); -var z = sh.exec(c); -var i = 0; -while ((z.Status == 0 && i < 50) || z.StdOut.AtEndOfStream == false) { - WScript.Sleep (100); - i++; - if (!z.StdOut.AtEndOfStream) { - WScript.StdOut.Write (z.StdOut.ReadAll()); - } -} diff --git a/PDFPatcher.sln b/PDFPatcher.sln index 51f22f5..0a516f5 100644 --- a/PDFPatcher.sln +++ b/PDFPatcher.sln @@ -1,18 +1,19 @@ 锘� Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31829.152 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32210.308 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDFPatcher", "App\PDFPatcher.csproj", "{77A9FBD2-FB25-4590-864A-64A01A8724C4}" ProjectSection(ProjectDependencies) = postProject {A8C76A16-25E3-45B6-B974-4F4CB88E5AE2} = {A8C76A16-25E3-45B6-B974-4F4CB88E5AE2} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jbig2", "jbig2\jbig2.vcxproj", "{A8C76A16-25E3-45B6-B974-4F4CB88E5AE2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jbig2", "JBig2\jbig2.vcxproj", "{A8C76A16-25E3-45B6-B974-4F4CB88E5AE2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3243E921-0EC3-44D1-96CC-C3E05BF9C89B}" ProjectSection(SolutionItems) = preProject - CopyReleasedFiles.js = CopyReleasedFiles.js + .gitattributes = .gitattributes + .gitignore = .gitignore README.md = README.md EndProjectSection EndProject @@ -29,6 +30,7 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {77A9FBD2-FB25-4590-864A-64A01A8724C4}.Debug|Any CPU.ActiveCfg = Debug|x86 + {77A9FBD2-FB25-4590-864A-64A01A8724C4}.Debug|Any CPU.Build.0 = Debug|x86 {77A9FBD2-FB25-4590-864A-64A01A8724C4}.Debug|Win32.ActiveCfg = Debug|x86 {77A9FBD2-FB25-4590-864A-64A01A8724C4}.Debug|Win32.Build.0 = Debug|x86 {77A9FBD2-FB25-4590-864A-64A01A8724C4}.Debug|x64.ActiveCfg = Debug|x86 @@ -59,9 +61,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - BuildVersion_BuildVersioningStyle = None.None.None.None - BuildVersion_UseGlobalSettings = False - BuildVersion_StartDate = 2000/1/1 - SolutionGuid = {F089AFCD-642F-4853-96F5-5BDC47E92E72} + SolutionGuid = {2A79F8C5-2A16-4D1C-9DCD-C6FA86808545} EndGlobalSection EndGlobal