diff --git a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj index 11a16590c..a5262c8e3 100644 --- a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj +++ b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj @@ -1,4 +1,4 @@ - + Debug @@ -9,6 +9,8 @@ Exe UpdateVersionStamp UpdateVersionStamp + v4.5 + true @@ -20,6 +22,7 @@ 4 false --sourcefolder=../.. --version=2.0.0.0 --version-tag=20140405 + false full @@ -28,6 +31,7 @@ prompt 4 false + false @@ -44,4 +48,7 @@ Duplicati.Library.Utility + + + \ No newline at end of file diff --git a/BuildTools/UpdateVersionStamp/app.config b/BuildTools/UpdateVersionStamp/app.config new file mode 100644 index 000000000..51278a456 --- /dev/null +++ b/BuildTools/UpdateVersionStamp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/BuildTools/WixIncludeMake/AssemblyInfo.cs b/BuildTools/WixIncludeMake/AssemblyInfo.cs deleted file mode 100644 index 20172853c..000000000 --- a/BuildTools/WixIncludeMake/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("WixIncludeMake")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("kenneth")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("2.0.0.7")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/BuildTools/WixIncludeMake/LinqHelpers.cs b/BuildTools/WixIncludeMake/LinqHelpers.cs deleted file mode 100644 index 1e4486781..000000000 --- a/BuildTools/WixIncludeMake/LinqHelpers.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace WixIncludeMake -{ - public static class LinqHelpers - { - public static Dictionary ToSafeDictionary(this IEnumerable source, Func keySelector, Func valueSelector, string locationName) - { - if (source == null) - throw new ArgumentNullException("source"); - if (keySelector == null) - throw new ArgumentNullException("keySelector"); - if (valueSelector == null) - throw new ArgumentNullException("valueSelector"); - - Dictionary res = new Dictionary(); - foreach (TSource el in source) - { - TKey k = keySelector(el); - TValue v = valueSelector(el); - - if (res.ContainsKey(k)) - Console.WriteLine("*** Warning, duplicate key: " + k.ToString() + " in " + locationName); - else - res.Add(k, v); - } - - return res; - } - } -} - diff --git a/BuildTools/WixIncludeMake/Program.cs b/BuildTools/WixIncludeMake/Program.cs deleted file mode 100644 index fcfec1292..000000000 --- a/BuildTools/WixIncludeMake/Program.cs +++ /dev/null @@ -1,372 +0,0 @@ -using System; -using System.Linq; -using System.Text; -using System.Xml.Linq; -using System.Collections.Generic; -using System.Reflection; - -namespace WixIncludeMake -{ - public class Program - { - private const string DB_FILE = "generated-keys.xml"; - private const string USER_FILE = "fixed-keys.xml"; - private static readonly string DIR_SEP = System.IO.Path.DirectorySeparatorChar.ToString(); - - public static readonly XNamespace XWIX = "http://schemas.microsoft.com/wix/2006/wi"; - - private interface IFolder - { - Dictionary Folders { get; } - Dictionary Files { get; } - } - - private class FolderInfo : IFolder - { - public Dictionary Folders { get; private set; } - public Dictionary Files { get; private set; } - public string Name { get; set; } - private string m_id; - public string ID { get { return m_id.Replace(" ", "").Replace("-", "").ToUpperInvariant(); } set { m_id = value; } } - public Guid GUID { get; set; } - - private FolderInfo() - { - Folders = new Dictionary(); - Files = new Dictionary(); - } - - public FolderInfo(string name, string id, Guid guid) - : this() - { - this.Name = name; - this.ID = id; - this.GUID = guid; - } - - public IEnumerable FileNodes - { - get - { - return - from x in Files - orderby x.Key - select - new XElement(XWIX + "File", - new XAttribute("Id", "file_" + x.Value.ID), - new XAttribute("Checksum", "yes"), - new XAttribute("Source", x.Value.SourceFile) - ); - } - } - - public XElement FolderNode - { - get - { - return - new XElement(XWIX + "Directory", - new XAttribute("Id", "dir_" + this.ID), - new XAttribute("Name", this.Name), - new XElement(XWIX + "Component", - new XAttribute("Id", "comp_" + this.ID), - new XAttribute("DiskId", 1), - new XAttribute("KeyPath", "yes"), - new XAttribute("Guid", this.GUID.ToString()), - new XAttribute("Win64", "$(var.Win64)"), - FileNodes - ), - from x in Folders - orderby x.Key - select x.Value.FolderNode - ); - - } - } - - public IEnumerable Subfolders - { - get - { - List res = new List(); - res.Add (this); - foreach(var f in this.Folders.Values) - res.AddRange(f.Subfolders); - return res; - } - } - } - - private class FileInfo - { - public string Name { get; set; } - private string m_id; - public string ID { get { return m_id.Replace(" ", "").Replace("-", "").ToUpperInvariant(); } set { m_id = value; } } - public string SourceFile { get; set; } - - public FileInfo(string name, string id, string sourcefile) - { - this.Name = name; - this.ID = id; - this.SourceFile = sourcefile; - } - } - - private class RootFolderInfo : FolderInfo - { - public Dictionary GeneratedKeys { get; private set; } - public Dictionary UserKeys { get; private set; } - public string ComponentID { get; set; } - private readonly Options m_opt; - - public RootFolderInfo(Options opt, IEnumerable paths = null) - : base("", "", Guid.NewGuid()) - { - GeneratedKeys = ReadKeyDatabase(opt.dbfilename); - UserKeys = ReadKeyDatabase(opt.userfilename); - ComponentID = opt.componentid; - m_opt = opt; - - string id; - if (!GeneratedKeys.TryGetValue(DIR_SEP, out id)) - id = Guid.NewGuid().ToString(); - - if (UserKeys.ContainsKey(DIR_SEP)) - id = UserKeys[DIR_SEP]; - - this.ID = id; - - Add (paths); - } - - public void Add(IEnumerable paths) - { - if (paths == null) - return; - - foreach(var p in paths) - Add (p); - } - - public void Add(string path) - { - if (string.IsNullOrEmpty(path)) - return; - - bool isDir = false; - if (path.EndsWith(DIR_SEP)) - { - isDir = true; - path = path.Substring(0, path.Length - 1); - } - - List folders = new List(); - string filename = null; - - while(!string.IsNullOrEmpty(path)) - { - string sourcepath = System.IO.Path.GetDirectoryName(path); - string elname = System.IO.Path.GetFileName(path); - folders.Add(elname); - - path = sourcepath; - if (path.EndsWith(DIR_SEP)) - path = path.Substring(0, path.Length - 1); - - } - - if (!isDir) - { - filename = folders[0]; - folders.RemoveAt (0); - } - - IFolder cur = this; - folders.Reverse(); - - StringBuilder sbp = new StringBuilder(); - - foreach(var f in folders) - { - sbp.Append(f); - sbp.Append(DIR_SEP); - - FolderInfo next; - if (!cur.Folders.TryGetValue(f, out next)) - { - //We have a new folder - string id; - if (!GeneratedKeys.TryGetValue(sbp.ToString(), out id)) - { - id = Guid.NewGuid().ToString(); - GeneratedKeys.Add(sbp.ToString(), id); - } - - Guid g; - try { g = new Guid(id); } - catch - { - g = Guid.NewGuid(); - GeneratedKeys[sbp.ToString()] = g.ToString(); - Console.Error.WriteLine ("Unable to parse {0} into a GUID, I told you not to edit the file!!!{1}A new GUID will be used: {2}", id, Environment.NewLine, g); - } - - string userkey; - if (!UserKeys.TryGetValue(sbp.ToString(), out userkey)) - userkey = g.ToString(); - - next = new FolderInfo(f, userkey, g); - cur.Folders.Add(f, next); - } - - cur = next; - } - - if (!string.IsNullOrEmpty(filename)) - { - sbp.Append(filename); - - string id; - if (!GeneratedKeys.TryGetValue(sbp.ToString(), out id)) - GeneratedKeys.Add(sbp.ToString(), id = Guid.NewGuid().ToString()); - if (UserKeys.ContainsKey(sbp.ToString())) - id = UserKeys[sbp.ToString()]; - - string fullpath = System.IO.Path.Combine(m_opt.fileprefix, sbp.ToString()).Replace(DIR_SEP, "\\"); - - cur.Files.Add(filename, new FileInfo(filename, id, fullpath)); - } - } - - public IEnumerable Node - { - get - { - List res = new List(); - res.Add(new XElement(XWIX + "Component", - new XAttribute("Id", "comp_" + this.ID), - new XAttribute("DiskId", 1), - new XAttribute("KeyPath", "yes"), - new XAttribute("Guid", this.GUID.ToString()), - new XAttribute("Win64", "$(var.Win64)"), - FileNodes - )); - - res.AddRange( - from x in Folders - orderby x.Key - select x.Value.FolderNode - ); - - return res; - } - } - - public XElement GroupNode - { - get - { - return new XElement(XWIX + "ComponentGroup", - new XAttribute("Id", this.ComponentID), - from x in this.Subfolders - select new XElement(XWIX + "ComponentRef", - new XAttribute("Id", "comp_" + x.ID) - ) - ); - } - } - } - - public static string GuidToString(Guid g) - { - StringBuilder sb = new StringBuilder(); - foreach(var b in g.ToByteArray()) - sb.Append(string.Format("{0:x2}", b)); - return sb.ToString(); - } - - private class Options - { - public string dbfilename = System.IO.Path.Combine(Environment.CurrentDirectory, DB_FILE); - public string userfilename = System.IO.Path.Combine(Environment.CurrentDirectory, USER_FILE); - public string sourcefolder = System.IO.Path.GetFullPath(Environment.CurrentDirectory); - public string outputfile = System.IO.Path.GetFullPath("binfiles.wxs"); - public string ignorefilter = null; - public string dirref = "INSTALLLOCATION"; - public string componentid = "FILES_COMPONENT"; - public string fileprefix = ""; - - public void Fixup() - { - sourcefolder = Duplicati.Library.Utility.Utility.AppendDirSeparator(System.IO.Path.GetFullPath(sourcefolder.Replace("/", DIR_SEP))); - outputfile = System.IO.Path.GetFullPath(outputfile.Replace("/", DIR_SEP)); - fileprefix = fileprefix.Replace("/", "\\"); - if (ignorefilter != null) - ignorefilter = ignorefilter.Replace("/", DIR_SEP); - } - } - - public static void Main (string[] _args) - { - List args = new List(_args); - Dictionary options = Duplicati.Library.Utility.CommandLineParser.ExtractOptions(args); - Options opt = new Options(); - - foreach(FieldInfo fi in opt.GetType().GetFields()) - if (options.ContainsKey(fi.Name)) - fi.SetValue(opt, options[fi.Name]); - - opt.Fixup(); - - Duplicati.Library.Utility.IFilter filter = null; - if (!string.IsNullOrEmpty(opt.ignorefilter)) - filter = new Duplicati.Library.Utility.FilterExpression(opt.ignorefilter, false); - - var paths = Duplicati.Library.Utility.Utility.EnumerateFileSystemEntries(opt.sourcefolder, filter).Select(x => x.Substring(opt.sourcefolder.Length)); - - //A bit backwards, but we have flattend the file list, and now we re-construct the tree, - // but we do not care much about performance here - RootFolderInfo rootfolder = new RootFolderInfo(opt, paths); - - new XDocument( - new XElement(XWIX + "Wix", - new XElement(XWIX + "Fragment", - rootfolder.GroupNode, - new XElement(XWIX + "DirectoryRef", - new XAttribute("Id", opt.dirref), - rootfolder.Node - ) - ) - ) - ).Save(opt.outputfile); - - WriteKeyDatabase(rootfolder.GeneratedKeys, opt.dbfilename, true); - - Console.WriteLine("Generated wxs: {0}", opt.outputfile); - - } - - private static Dictionary ReadKeyDatabase(string filename) - { - if (!System.IO.File.Exists(filename)) - return new Dictionary(); - - return XDocument.Load(filename).Element("root").Elements("entry").ToSafeDictionary( - c => c.Attribute("name").Value.Replace("\\", DIR_SEP), c => c.Attribute("key").Value, filename); - } - - private static void WriteKeyDatabase(Dictionary keys, string filename, bool isKeyDb) - { - new XDocument( - new XComment(isKeyDb ? "This file is autogenerated, do not edit! EVER!" : "format is "), - new XElement("root", - from x in keys - select new XElement("entry", - new XAttribute("name", x.Key.Replace(DIR_SEP, "\\")), - new XAttribute("key", x.Value) - ) - ) - ).Save(filename); - } - } -} diff --git a/BuildTools/WixIncludeMake/WixIncludeMake.csproj b/BuildTools/WixIncludeMake/WixIncludeMake.csproj deleted file mode 100644 index 08c3bf5d9..000000000 --- a/BuildTools/WixIncludeMake/WixIncludeMake.csproj +++ /dev/null @@ -1,47 +0,0 @@ - - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {34426731-7BAD-4B28-BD80-FD117EC082E5} - Exe - WixIncludeMake - WixIncludeMake - WixIncludeMake.Program - - - full - false - bin\Debug\ - 4 - false - true - --sourcefolder=../Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release --fileprefix=bin/Release/ --ignorefilter=*.dll.config:*.mdb:*.log:*.sqlite:*/tempdir:*/control_dir/:*/SVGIcons/:*/lvm-scripts/ - - - none - false - bin\Release\ - 4 - - - - - - - - - - - - - - - - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65} - Duplicati.Library.Utility - - - \ No newline at end of file diff --git a/BuildTools/WixIncludeMake/WixIncludeMake.sln b/BuildTools/WixIncludeMake/WixIncludeMake.sln deleted file mode 100644 index a27a9fb3a..000000000 --- a/BuildTools/WixIncludeMake/WixIncludeMake.sln +++ /dev/null @@ -1,32 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixIncludeMake", "WixIncludeMake.csproj", "{34426731-7BAD-4B28-BD80-FD117EC082E5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Utility", "..\..\Duplicati\Library\Utility\Duplicati.Library.Utility.csproj", "{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {34426731-7BAD-4B28-BD80-FD117EC082E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34426731-7BAD-4B28-BD80-FD117EC082E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34426731-7BAD-4B28-BD80-FD117EC082E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34426731-7BAD-4B28-BD80-FD117EC082E5}.Release|Any CPU.Build.0 = Release|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Debug|x86.ActiveCfg = Debug|x86 - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Debug|x86.Build.0 = Debug|x86 - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|Any CPU.Build.0 = Release|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|x86.ActiveCfg = Release|x86 - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = WixIncludeMake.csproj - EndGlobalSection -EndGlobal diff --git a/BuildTools/WixProjBuilder/Program.cs b/BuildTools/WixProjBuilder/Program.cs deleted file mode 100644 index 035b2885f..000000000 --- a/BuildTools/WixProjBuilder/Program.cs +++ /dev/null @@ -1,262 +0,0 @@ -#region Disclaimer / License -// Copyright (C) 2015, The Duplicati Team -// http://www.duplicati.com, info@duplicati.com -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// -#endregion -using System; -using System.Collections.Generic; -using System.Text; - -namespace WixProjBuilder -{ - class Program - { - static void Main(string[] _args) - { - List args = new List(_args); - Dictionary options = Duplicati.Library.Utility.CommandLineParser.ExtractOptions(args); - - if (args.Count != 1) - { - Console.WriteLine("Usage: "); - Console.WriteLine(" WixProjBuilder.exe [option=value]"); - return; - } - - if (!System.IO.File.Exists(args[0])) - { - Console.WriteLine(string.Format("File not found: {0}", args[0])); - return; - } - - string wixpath; - if (options.ContainsKey("wixpath")) - wixpath = options["wixpath"]; - else - wixpath = System.Environment.GetEnvironmentVariable("WIXPATH"); - - if (string.IsNullOrEmpty(wixpath)) - { - string[] known_wix_names = new string[] - { - "Windows Installer XML v3", - "Windows Installer XML v3.1", - "Windows Installer XML v3.2", - "Windows Installer XML v3.3", - "Windows Installer XML v3.4", - "Windows Installer XML v3.5", - "Windows Installer XML v3.6", - "Windows Installer XML v3.7", - "Windows Installer XML v3.8", - "Windows Installer XML v3.9", - "WiX Toolset v3.6", - "WiX Toolset v3.7", - "WiX Toolset v3.8", - "WiX Toolset v3.9", - }; - - foreach(var p in known_wix_names) - { - foreach(var p2 in new string[] {"%ProgramFiles(x86)%", "%programfiles%"}) - { - wixpath = System.IO.Path.Combine(System.IO.Path.Combine(Environment.ExpandEnvironmentVariables(p2), p), "bin"); - if (System.IO.Directory.Exists(wixpath)) - { - Console.WriteLine(string.Format("*** wixpath not specified, using: {0}", wixpath)); - break; - } - } - - if (System.IO.Directory.Exists(wixpath)) - break; - } - - } - - - if (!System.IO.Directory.Exists(wixpath)) - { - Console.WriteLine(string.Format("WiX not found, please install Windows Installer XML 3 or greater")); - Console.WriteLine(string.Format(" supply path to WiX bin folder with option --wixpath=...path...")); - return; - } - - args[0] = System.IO.Path.GetFullPath(args[0]); - - Console.WriteLine(string.Format("Parsing wixproj file: {0}", args[0])); - - System.Xml.XmlDocument doc = new System.Xml.XmlDocument(); - doc.Load(args[0]); - - string config = "Release"; - if (options.ContainsKey("configuration")) - config = options["configuration"]; - - string projdir = System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(args[0])); - - List includes = new List(); - List refs = new List(); - List content = new List(); - - System.Xml.XmlNamespaceManager nm = new System.Xml.XmlNamespaceManager(doc.NameTable); - nm.AddNamespace("ms", "http://schemas.microsoft.com/developer/msbuild/2003"); - - foreach (System.Xml.XmlNode n in doc.SelectNodes("ms:Project/ms:ItemGroup/ms:Compile", nm)) - includes.Add(n.Attributes["Include"].Value); - - foreach (System.Xml.XmlNode n in doc.SelectNodes("ms:Project/ms:ItemGroup/ms:Content", nm)) - content.Add(n.Attributes["Include"].Value); - - foreach (System.Xml.XmlNode n in doc.SelectNodes("ms:Project/ms:ItemGroup/ms:WixExtension", nm)) - refs.Add(n.Attributes["Include"].Value); - - - string objdir = System.IO.Path.Combine(System.IO.Path.Combine(projdir, "obj"), config); - string packagename = "output"; - string outdir = System.IO.Path.Combine("bin", config); - string outtype = "Package"; - - //TODO: Support multiconfiguration system correctly - foreach (System.Xml.XmlNode n in doc.SelectNodes("ms:Project/ms:PropertyGroup/ms:Configuration", nm)) - if (true) //if (string.Compare(n.InnerText, config, true) == 0) - { - System.Xml.XmlNode p = n.ParentNode; - if (p["OutputName"] != null) - packagename = p["OutputName"].InnerText; - if (p["OutputType"] != null) - outtype = p["OutputType"].InnerText; - if (p["OutputPath"] != null) - outdir = p["OutputPath"].InnerText.Replace("$(Configuration)", config); - if (p["IntermediateOutputPath"] != null) - objdir = p["IntermediateOutputPath"].InnerText.Replace("$(Configuration)", config); - } - - if (!objdir.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString())) - objdir += System.IO.Path.DirectorySeparatorChar; - - string msiname = System.IO.Path.Combine(outdir, packagename + ".msi"); - - Console.WriteLine(" Compiling ... "); - if (includes.Count == 0) - { - Console.WriteLine("No files found to compile in project file"); - return; - } - - string compile_args = "\"" + string.Join("\" \"", includes.ToArray()) + "\""; - compile_args += " -out \"" + objdir.Replace("\\", "\\\\") + "\""; - - if (options.ContainsKey("platform") && options["platform"] == "x64") - compile_args += " -dPlatform=x64 -dWin64=yes"; - else - compile_args += " -dPlatform=x86 -dWin64=no"; - - int res = Execute( - System.IO.Path.Combine(wixpath, "candle.exe"), - projdir, - compile_args); - - if (res != 0) - { - Console.WriteLine("Compilation failed, aborting"); - return; - } - - Console.WriteLine(" Linking ..."); - - for (int i = 0; i < includes.Count; i++) - includes[i] = System.IO.Path.Combine(objdir, System.IO.Path.GetFileNameWithoutExtension(includes[i]) + ".wixobj"); - - for (int i = 0; i < refs.Count; i++) - if (!System.IO.Path.IsPathRooted(refs[i])) - { - refs[i] = FindDll(refs[i] + ".dll", new string[] { projdir, wixpath }); - if (!System.IO.Path.IsPathRooted(refs[i])) - refs[i] = FindDll(refs[i]); - } - - string link_args = "\"" + string.Join("\" \"", includes.ToArray()) + "\""; - - if (refs.Count > 0) - link_args += " -ext \"" + string.Join("\" -ext \"", refs.ToArray()) + "\""; - - link_args += " -out \"" + msiname + "\""; - - res = Execute( - System.IO.Path.Combine(wixpath, "light.exe"), - projdir, - link_args); - - if (res != 0) - { - Console.WriteLine("Link failed, aborting"); - return; - } - - if (!System.IO.Path.IsPathRooted(msiname)) - msiname = System.IO.Path.GetFullPath(System.IO.Path.Combine(projdir, msiname)); - - Console.WriteLine(string.Format("Done: {0}", msiname)); - } - - private static int Execute(string app, string workdir, string args) - { - System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo(app, args); - psi.CreateNoWindow = true; - psi.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden; - psi.WorkingDirectory = workdir; - psi.RedirectStandardOutput = true; - psi.RedirectStandardError = true; - psi.UseShellExecute = false; - - System.Diagnostics.Process p = System.Diagnostics.Process.Start(psi); - p.WaitForExit(5 * 60 * 1000); //Wait up to five minutes - if (!p.HasExited) - { - try { p.Kill(); } - catch { } - - Console.WriteLine("Stdout: " + p.StandardOutput.ReadToEnd()); - Console.WriteLine("Stderr: " + p.StandardError.ReadToEnd()); - - throw new Exception(string.Format("Application {0} hung", app)); - } - - Console.WriteLine(); - Console.WriteLine(p.StandardOutput.ReadToEnd()); - Console.WriteLine(p.StandardError.ReadToEnd()); - Console.WriteLine(); - - - return p.ExitCode; - } - - private static string FindDll(string filename) - { - return FindDll(filename, System.Environment.GetEnvironmentVariable("path").Split(System.IO.Path.PathSeparator)); - } - - private static string FindDll(string filename, IEnumerable paths) - { - foreach (string p in paths) - if (System.IO.File.Exists(System.IO.Path.Combine(p, filename))) - return System.IO.Path.Combine(p, filename); - - return filename; - } - } -} diff --git a/BuildTools/WixProjBuilder/Properties/AssemblyInfo.cs b/BuildTools/WixProjBuilder/Properties/AssemblyInfo.cs deleted file mode 100644 index 631363cf9..000000000 --- a/BuildTools/WixProjBuilder/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -#region Disclaimer / License -// Copyright (C) 2015, The Duplicati Team -// http://www.duplicati.com, info@duplicati.com -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// -#endregion -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("WixProjBuilder")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("HexaD")] -[assembly: AssemblyProduct("WixProjBuilder")] -[assembly: AssemblyCopyright("Copyright © HexaD 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("aec90a98-c777-46f0-ba4f-1f81dc9fda11")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("2.0.0.7")] -[assembly: AssemblyVersion("2.0.0.7")] -[assembly: AssemblyFileVersion("2.0.0.7")] diff --git a/BuildTools/WixProjBuilder/WixProjBuilder.csproj b/BuildTools/WixProjBuilder/WixProjBuilder.csproj deleted file mode 100644 index 3379f68d9..000000000 --- a/BuildTools/WixProjBuilder/WixProjBuilder.csproj +++ /dev/null @@ -1,70 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {794CD060-AB3B-4885-B23B-6B26272C84E0} - Exe - Properties - WixProjBuilder - WixProjBuilder - v4.5 - 512 - - - 3.5 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - 3.5 - - - 3.5 - - - - - - - - - - - - - - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65} - Duplicati.Library.Utility - - - - - \ No newline at end of file diff --git a/BuildTools/WixProjBuilder/WixProjBuilder.sln b/BuildTools/WixProjBuilder/WixProjBuilder.sln deleted file mode 100644 index 49f93b496..000000000 --- a/BuildTools/WixProjBuilder/WixProjBuilder.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixProjBuilder", "WixProjBuilder.csproj", "{794CD060-AB3B-4885-B23B-6B26272C84E0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Utility", "..\..\Duplicati\Library\Utility\Duplicati.Library.Utility.csproj", "{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {794CD060-AB3B-4885-B23B-6B26272C84E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {794CD060-AB3B-4885-B23B-6B26272C84E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {794CD060-AB3B-4885-B23B-6B26272C84E0}.Debug|x86.ActiveCfg = Debug|Any CPU - {794CD060-AB3B-4885-B23B-6B26272C84E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {794CD060-AB3B-4885-B23B-6B26272C84E0}.Release|Any CPU.Build.0 = Release|Any CPU - {794CD060-AB3B-4885-B23B-6B26272C84E0}.Release|x86.ActiveCfg = Release|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Debug|x86.ActiveCfg = Debug|x86 - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Debug|x86.Build.0 = Debug|x86 - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|Any CPU.Build.0 = Release|Any CPU - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|x86.ActiveCfg = Release|x86 - {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/BuildTools/WixProjBuilder/app.config b/BuildTools/WixProjBuilder/app.config deleted file mode 100644 index b4ca687d2..000000000 --- a/BuildTools/WixProjBuilder/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/BuildTools/WixProjBuilder/license.txt b/BuildTools/WixProjBuilder/license.txt deleted file mode 100644 index cd9008a6d..000000000 --- a/BuildTools/WixProjBuilder/license.txt +++ /dev/null @@ -1,491 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - - Copyright 2015, http://www.duplicati.com, info@duplicati.com diff --git a/Installer/Duplicati.wxs b/Installer/Duplicati.wxs index dc4d67a8e..acef64ab6 100644 --- a/Installer/Duplicati.wxs +++ b/Installer/Duplicati.wxs @@ -4,89 +4,67 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - Installed OR NETFRAMEWORK20 + + + - 1 - - - - - - - - - WIXUI_EXITDIALOGOPTIONALCHECKBOX and NOT Installed + Control="Finish" + Event="DoAction" + Value="LaunchApplication"> + + - - - - - + + + + - + - + @@ -96,43 +74,10 @@ - - - + @@ -144,7 +89,7 @@ - + diff --git a/Installer/How to build release.txt b/Installer/How to build release.txt deleted file mode 100644 index 3b918745c..000000000 --- a/Installer/How to build release.txt +++ /dev/null @@ -1,19 +0,0 @@ -For a release build, do this: - -1. Update the SVN to the correct revision and note the revision number -2. Run the UpdateVersionNumber.exe and set the revision number -3. Rebuild the solution in Release mode -4. Run "VS Express build.bat" -5. Go to folder bin\Release -6. Rename "Duplicati.msi" to "Duplicati 1.0 r???.msi" -7. Rename "Duplicati.zip" to "Duplicati 1.0 r???.zip" -8. Verify that the "Run application now" works in the MSI - -If the zip file is missing, you need to install 7zip. -If the msi file is missing, you need to install the .Net SDK 2.0. -If you get errors during run, you may need to download "paraffin.exe" (v3.13): -http://www.wintellect.com/blogs/jrobbins/wix-a-better-tallow-paraffin-part-3-of-3 -http://www.wintellect.com/CS/files/folders/8198/download.aspx //broken link - -You also need to install Wix (Tested with 3.0): -http://wix.sourceforge.net/ diff --git a/Installer/Shortcuts.wxs b/Installer/Shortcuts.wxs index 81577118d..69b88a20a 100644 --- a/Installer/Shortcuts.wxs +++ b/Installer/Shortcuts.wxs @@ -3,33 +3,29 @@ - - - - - - - - - - + + + + + + - diff --git a/Installer/UpgradeData.wxi b/Installer/UpgradeData.wxi index f34f94cb0..2a5d192ff 100644 --- a/Installer/UpgradeData.wxi +++ b/Installer/UpgradeData.wxi @@ -1,6 +1,6 @@ - + diff --git a/Installer/VS Express build.bat b/Installer/VS Express build.bat deleted file mode 100644 index 7c454c58d..000000000 --- a/Installer/VS Express build.bat +++ /dev/null @@ -1,77 +0,0 @@ -@echo off -SET ORIGIN_PATH=%CD% - -rmdir /S /Q "bin\Release" - -msbuild /property:Configuration=Release /target:Clean ..\Duplicati.sln - -echo "Building support tools ..." -msbuild /property:Configuration=Release ..\BuildTools\UpdateVersionStamp\UpdateVersionStamp.sln -msbuild /property:Configuration=Release ..\BuildTools\WixIncludeMake\WixIncludeMake.sln -msbuild /property:Configuration=Release ..\BuildTools\WixProjBuilder\WixProjBuilder.sln - -echo "Updating version number ..." -..\BuildTools\UpdateVersionStamp\bin\Release\UpdateVersionStamp.exe --sourcefolder=.. - -if exist .\buildtag.txt copy .\buildtag.txt ..\Duplicati\Library\License\VersionTag.txt - -echo "Building main project ..." -msbuild /property:Configuration=Release ..\Duplicati.sln - -echo "Setting up target structure" -mkdir bin -cd bin -mkdir Release -cd Release - -mkdir Duplicati -cd Duplicati - -mkdir webroot - -xcopy /I /Y /E ..\..\..\..\Duplicati\GUI\Duplicati.GUI.TrayIcon\bin\Release\* . -xcopy /I /Y /E ..\..\..\..\Duplicati\Server\webroot\* .\webroot -del *.pdb /Q -del *.mdb /Q -del *.dll.config /Q -xcopy /I /Y "..\..\..\linux help\*" . -del "*.vshost.*" /Q -mkdir Tools -xcopy /I /Y /E ..\..\..\..\Tools .\Tools - -if exist .\oem.js copy .\oem.js .\webroot\scripts -if exist .\oem.css copy .\oem.css .\webroot\stylesheets -if exist ..\oem.js copy ..\oem.js .\webroot\scripts -if exist ..\oem.css copy ..\oem.css .\webroot\stylesheets - -REM Prepare the config file with version overrides -echo "" > "Duplicati.CommandLine.exe.config" -echo "" > "Duplicati.GUI.TrayIcon.exe.config" -echo "" > "Duplicati.Server.exe.config" -xcopy /Y ..\..\..\AssemblyRedirects.xml "Duplicati.CommandLine.exe.config" -xcopy /Y ..\..\..\AssemblyRedirects.xml "Duplicati.GUI.TrayIcon.exe.config" -xcopy /Y ..\..\..\AssemblyRedirects.xml "Duplicati.Server.exe.config" - -cd ..\..\.. - -echo "Updating WiX list ..." -..\BuildTools\WixIncludeMake\bin\Release\WixIncludeMake.exe --sourcefolder=bin/Release/Duplicati --fileprefix=bin/Release/Duplicati --componentid=DUPLICATIBIN --ignorefilter="*.dll.config:*.mdb:*.log:*.sqlite:*/tempdir:*/control_dir/:*/SVGIcons/:*/lvm-scripts/:*/OSX Icons/" - -REM This dll enables Mono on Windows support -xcopy /I /Y "..\thirdparty\SQLite\Bin\sqlite3.dll" "bin\Release\Duplicati" - -echo "Building zip version ..." -cd "bin\Release" -"%PROGRAMFILES%\7-zip\7z.exe" a -r "Duplicati.zip" Duplicati -cd "..\.." - -echo "Building msi version ..." -..\BuildTools\WixProjBuilder\bin\Release\WixProjBuilder.exe WixInstaller.wixproj -move "bin\Release\Duplicati.msi" "bin\Release\Duplicati.x86.msi" -..\BuildTools\WixProjBuilder\bin\Release\WixProjBuilder.exe --platform=x64 WixInstaller.wixproj -move "bin\Release\Duplicati.msi" "bin\Release\Duplicati.x64.msi" -pause - -goto end_of_program - -:end_of_program \ No newline at end of file diff --git a/Installer/WixInstaller.wixproj b/Installer/WixInstaller.wixproj index 8952dc254..b1b243b2d 100644 --- a/Installer/WixInstaller.wixproj +++ b/Installer/WixInstaller.wixproj @@ -1,18 +1,20 @@  Debug - x86 - 3.0 + x64 + 3.9 {ab757800-a4cb-478b-a359-33786d0e8a9c} 2.0 Duplicati Package - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + HarvestPath=bin\$(Configuration)\Duplicati\ bin\$(Configuration)\ obj\$(Configuration)\ - Debug;Win64=no + Debug;Win64=no;$(HeatDefinitions) @@ -21,7 +23,7 @@ obj\$(Configuration)\ - Win64=no + Win64=no;$(HeatDefinitions) Debug;Win64=yes @@ -29,13 +31,14 @@ obj\$(Platform)\$(Configuration)\ + Debug;Win64=yes;$(HeatDefinitions) bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - Win64=yes + Win64=yes;$(HeatDefinitions) @@ -62,13 +65,16 @@ $(WixExtDir)\WixUIExtension.dll + + + + - \ No newline at end of file diff --git a/Installer/fixed-keys.xml b/Installer/fixed-keys.xml deleted file mode 100644 index 4c37e3c00..000000000 --- a/Installer/fixed-keys.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Installer/googlecode_upload.py b/Installer/googlecode_upload.py deleted file mode 100644 index 15b632970..000000000 --- a/Installer/googlecode_upload.py +++ /dev/null @@ -1,248 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2006, 2007 Google Inc. All Rights Reserved. -# Author: danderson@google.com (David Anderson) -# -# Script for uploading files to a Google Code project. -# -# This is intended to be both a useful script for people who want to -# streamline project uploads and a reference implementation for -# uploading files to Google Code projects. -# -# To upload a file to Google Code, you need to provide a path to the -# file on your local machine, a small summary of what the file is, a -# project name, and a valid account that is a member or owner of that -# project. You can optionally provide a list of labels that apply to -# the file. The file will be uploaded under the same name that it has -# in your local filesystem (that is, the "basename" or last path -# component). Run the script with '--help' to get the exact syntax -# and available options. -# -# Note that the upload script requests that you enter your -# googlecode.com password. This is NOT your Gmail account password! -# This is the password you use on googlecode.com for committing to -# Subversion and uploading files. You can find your password by going -# to http://code.google.com/hosting/settings when logged in with your -# Gmail account. If you have already committed to your project's -# Subversion repository, the script will automatically retrieve your -# credentials from there (unless disabled, see the output of '--help' -# for details). -# -# If you are looking at this script as a reference for implementing -# your own Google Code file uploader, then you should take a look at -# the upload() function, which is the meat of the uploader. You -# basically need to build a multipart/form-data POST request with the -# right fields and send it to https://PROJECT.googlecode.com/files . -# Authenticate the request using HTTP Basic authentication, as is -# shown below. -# -# Licensed under the terms of the Apache Software License 2.0: -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Questions, comments, feature requests and patches are most welcome. -# Please direct all of these to the Google Code users group: -# http://groups.google.com/group/google-code-hosting - -"""Google Code file uploader script. -""" - -__author__ = 'danderson@google.com (David Anderson)' - -import httplib -import os.path -import optparse -import getpass -import base64 -import sys - - -def upload(file, project_name, user_name, password, summary, labels=None): - """Upload a file to a Google Code project's file server. - - Args: - file: The local path to the file. - project_name: The name of your project on Google Code. - user_name: Your Google account name. - password: The googlecode.com password for your account. - Note that this is NOT your global Google Account password! - summary: A small description for the file. - labels: an optional list of label strings with which to tag the file. - - Returns: a tuple: - http_status: 201 if the upload succeeded, something else if an - error occured. - http_reason: The human-readable string associated with http_status - file_url: If the upload succeeded, the URL of the file on Google - Code, None otherwise. - """ - # The login is the user part of user@gmail.com. If the login provided - # is in the full user@domain form, strip it down. - if user_name.endswith('@gmail.com'): - user_name = user_name[:user_name.index('@gmail.com')] - - form_fields = [('summary', summary)] - if labels is not None: - form_fields.extend([('label', l.strip()) for l in labels]) - - content_type, body = encode_upload_request(form_fields, file) - - upload_host = '%s.googlecode.com' % project_name - upload_uri = '/files' - auth_token = base64.b64encode('%s:%s'% (user_name, password)) - headers = { - 'Authorization': 'Basic %s' % auth_token, - 'User-Agent': 'Googlecode.com uploader v0.9.4', - 'Content-Type': content_type, - } - - server = httplib.HTTPSConnection(upload_host) - server.request('POST', upload_uri, body, headers) - resp = server.getresponse() - server.close() - - if resp.status == 201: - location = resp.getheader('Location', None) - else: - location = None - return resp.status, resp.reason, location - - -def encode_upload_request(fields, file_path): - """Encode the given fields and file into a multipart form body. - - fields is a sequence of (name, value) pairs. file is the path of - the file to upload. The file will be uploaded to Google Code with - the same file name. - - Returns: (content_type, body) ready for httplib.HTTP instance - """ - BOUNDARY = '----------Googlecode_boundary_reindeer_flotilla' - CRLF = '\r\n' - - body = [] - - # Add the metadata about the upload first - for key, value in fields: - body.extend( - ['--' + BOUNDARY, - 'Content-Disposition: form-data; name="%s"' % key, - '', - value, - ]) - - # Now add the file itself - file_name = os.path.basename(file_path) - f = open(file_path, 'rb') - file_content = f.read() - f.close() - - body.extend( - ['--' + BOUNDARY, - 'Content-Disposition: form-data; name="filename"; filename="%s"' - % file_name, - # The upload server determines the mime-type, no need to set it. - 'Content-Type: application/octet-stream', - '', - file_content, - ]) - - # Finalize the form body - body.extend(['--' + BOUNDARY + '--', '']) - - return 'multipart/form-data; boundary=%s' % BOUNDARY, CRLF.join(body) - - -def upload_find_auth(file_path, project_name, summary, labels=None, - user_name=None, password=None, tries=3): - """Find credentials and upload a file to a Google Code project's file server. - - file_path, project_name, summary, and labels are passed as-is to upload. - - Args: - file_path: The local path to the file. - project_name: The name of your project on Google Code. - summary: A small description for the file. - labels: an optional list of label strings with which to tag the file. - config_dir: Path to Subversion configuration directory, 'none', or None. - user_name: Your Google account name. - tries: How many attempts to make. - """ - - while tries > 0: - if user_name is None: - # Read username if not specified or loaded from svn config, or on - # subsequent tries. - sys.stdout.write('Please enter your googlecode.com username: ') - sys.stdout.flush() - user_name = sys.stdin.readline().rstrip() - if password is None: - # Read password if not loaded from svn config, or on subsequent tries. - print 'Please enter your googlecode.com password.' - print '** Note that this is NOT your Gmail account password! **' - print 'It is the password you use to access Subversion repositories,' - print 'and can be found here: http://code.google.com/hosting/settings' - password = getpass.getpass() - - status, reason, url = upload(file_path, project_name, user_name, password, - summary, labels) - # Returns 403 Forbidden instead of 401 Unauthorized for bad - # credentials as of 2007-07-17. - if status in [httplib.FORBIDDEN, httplib.UNAUTHORIZED]: - # Rest for another try. - user_name = password = None - tries = tries - 1 - else: - # We're done. - break - - return status, reason, url - - -def main(): - parser = optparse.OptionParser(usage='googlecode-upload.py -s SUMMARY ' - '-p PROJECT [options] FILE') - parser.add_option('-s', '--summary', dest='summary', - help='Short description of the file') - parser.add_option('-p', '--project', dest='project', - help='Google Code project name') - parser.add_option('-u', '--user', dest='user', - help='Your Google Code username') - parser.add_option('-w', '--password', dest='password', - help='Your Google Code password') - parser.add_option('-l', '--labels', dest='labels', - help='An optional list of comma-separated labels to attach ' - 'to the file') - - options, args = parser.parse_args() - - if not options.summary: - parser.error('File summary is missing.') - elif not options.project: - parser.error('Project name is missing.') - elif len(args) < 1: - parser.error('File to upload not provided.') - elif len(args) > 1: - parser.error('Only one file may be specified.') - - file_path = args[0] - - if options.labels: - labels = options.labels.split(',') - else: - labels = None - - status, reason, url = upload_find_auth(file_path, options.project, - options.summary, labels, - options.user, options.password) - if url: - print 'The file was uploaded successfully.' - print 'URL: %s' % url - return 0 - else: - print 'An error occurred. Your file was not uploaded.' - print 'Google Code upload server said: %s (%s)' % (reason, status) - return 1 - - -if __name__ == '__main__': - sys.exit(main()) \ No newline at end of file diff --git a/Installer/run-upload.bat b/Installer/run-upload.bat deleted file mode 100644 index e0d906321..000000000 --- a/Installer/run-upload.bat +++ /dev/null @@ -1,2 +0,0 @@ -python upload.py -pause \ No newline at end of file diff --git a/Installer/set-vs-express-env.bat b/Installer/set-vs-express-env.bat deleted file mode 100644 index 51c1b42a5..000000000 --- a/Installer/set-vs-express-env.bat +++ /dev/null @@ -1 +0,0 @@ -SET PATH=%PATH%;C:\Windows\Microsoft.NET\Framework64\v4.0.30319 \ No newline at end of file diff --git a/Installer/upload.py b/Installer/upload.py deleted file mode 100644 index 2cbbe0be6..000000000 --- a/Installer/upload.py +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/env python - -import sys -import os -import glob - -def main(): - - source_folder = os.path.join('bin', 'release') - - new_version = None - suggest_string = '' - - for testfile in glob.glob( os.path.join(source_folder, 'Duplicati *.zip') ): - version_info = testfile[testfile.rfind('Duplicati ') + len('Duplicati '):- len('.zip')] - if new_version is None: - new_version = version_info - suggest_string = '[' + new_version + ']' - else: - sys.stdout.write('More than one file matching, no auto suggests for you!\n') - suggest_string = '' - new_version = None - break - - sys.stdout.write('Please enter file version number ' + suggest_string + ': ') - file_version = sys.stdin.readline().rstrip() - - if (file_version is None or len(file_version) == 0): - file_version = new_version - - if (file_version is None or len(file_version) == 0): - sys.stdout.write('No name given, exiting\n') - sys.exit(-1) - - summary_base = "Duplicati " + file_version - filename_base = "Duplicati " + file_version - - sys.stdout.write('Please enter description [' + summary_base + ']: ') - tmp = file_version = sys.stdin.readline().rstrip() - if (len(tmp) != 0): - sumary_base = tmp - - filename_zip = filename_base + ".zip" - filename_msi_x86 = filename_base + ".msi" - filename_msi_x64 = filename_base + ".x64.msi" - filename_deb = filename_base + ".deb" - filename_dmg = filename_base + ".dmg" - filename_rpm = filename_base + ".noarch.rpm" - filename_tgz = filename_base + ".tgz" - - filename_zip = os.path.join(source_folder, filename_zip) - filename_msi_x86 = os.path.join(source_folder, filename_msi_x86) - filename_msi_x64 = os.path.join(source_folder, filename_msi_x64) - filename_deb = os.path.join(source_folder, filename_deb) - filename_dmg = os.path.join(source_folder, filename_dmg) - filename_rpm = os.path.join(source_folder, filename_rpm) - filename_tgz = os.path.join(source_folder, filename_tgz) - - username = None - password = None - - upload_count = 0 - - try: - with open('account_info', 'r') as f: - username = f.readline().strip() - password = f.readline().strip() - except IOError as e: - None - - if (username is None or len(username) == 0 or password is None or len(password) == 0): - sys.stdout.write("username or password was empty\n") - sys.stdout.write("please make a file called account_info with the\n") - sys.stdout.write("username on the first line and the\n") - sys.stdout.write("google code password on the second line\n") - return -1 - - if (os.path.exists(filename_zip)): - sys.stdout.write('Uploading file: ' + filename_zip + '\n') - os.system('python googlecode_upload.py --summary="' + summary_base + ' - Binaries" --project="duplicati" --labels="Type-Archive,OpSys-All" "' + filename_zip + '" --user="' + username + '" --password="' + password + '"') - upload_count+=1 - - if (os.path.exists(filename_msi_x86)): - sys.stdout.write('Uploading file: ' + filename_msi_x86 + '\n') - os.system('python googlecode_upload.py --summary="' + summary_base + ' - Windows" --project="duplicati" --labels="Type-Installer,OpSys-Windows" "' + filename_msi_x86 + '" --user="' + username + '" --password="' + password + '"') - upload_count+=1 - - if (os.path.exists(filename_msi_x64)): - sys.stdout.write('Uploading file: ' + filename_msi_x64 + '\n') - os.system('python googlecode_upload.py --summary="' + summary_base + ' - Windows 64bit" --project="duplicati" --labels="Type-Installer,OpSys-Windows" "' + filename_msi_x64 + '" --user="' + username + '" --password="' + password + '"') - upload_count+=1 - - if (os.path.exists(filename_deb)): - sys.stdout.write('Uploading file: ' + filename_deb + '\n') - os.system('python googlecode_upload.py --summary="' + summary_base + ' - Debian package" --project="duplicati" --labels="Type-Installer,OpSys-Linux" "' + filename_deb + '" --user="' + username + '" --password="' + password + '"') - upload_count+=1 - - if (os.path.exists(filename_rpm)): - sys.stdout.write('Uploading file: ' + filename_rpm + '\n') - os.system('python googlecode_upload.py --summary="' + summary_base + ' - Fedora package" --project="duplicati" --labels="Type-Installer,OpSys-Linux" "' + filename_rpm + '" --user="' + username + '" --password="' + password + '"') - upload_count+=1 - - if (os.path.exists(filename_dmg)): - sys.stdout.write('Uploading file: ' + filename_dmg + '\n') - os.system('python googlecode_upload.py --summary="' + summary_base + ' - Mac OSX image" --project="duplicati" --labels="Type-Installer,OpSys-OSX" "' + filename_dmg + '" --user="' + username + '" --password="' + password + '"') - upload_count+=1 - - if (os.path.exists(filename_tgz)): - sys.stdout.write('Uploading file: ' + filename_tgz + '\n') - os.system('python googlecode_upload.py --summary="' + summary_base + ' - Linux tgz package" --project="duplicati" --labels="Type-Installer,OpSys-Linux" "' + filename_tgz + '" --user="' + username + '" --password="' + password + '"') - upload_count+=1 - - if (upload_count == 0): - sys.stdout.write('No files uploaded, wrong filename?') - else: - sys.stdout.write('All uploaded !') - -if __name__ == '__main__': - sys.exit(main()) - diff --git a/build-msi.bat b/build-msi.bat new file mode 100644 index 000000000..b6479c370 --- /dev/null +++ b/build-msi.bat @@ -0,0 +1,23 @@ +@echo off + +call "%VS120COMNTOOLS%vsvars32.bat" + +rmdir /s /q Duplicati\Server\webroot + +7z x -oDuplicati\Server %1 webroot + +rmdir /s /q Duplicati\GUI\Duplicati.GUI.TrayIcon\bin\Release +mkdir Duplicati\GUI\Duplicati.GUI.TrayIcon\bin\Release + +7z x -oDuplicati\GUI\Duplicati.GUI.TrayIcon\bin\Release -x!webroot %1 + +cd Installer + +rmdir /s /q obj +rmdir /s /q bin + +msbuild /property:Configuration=Release + +cd .. + +copy Installer\bin\x64\Release\Duplicati.msi Duplicati.msi