From 1e5b325ea5a5f63e13bb9ee89406e331b73cae4a Mon Sep 17 00:00:00 2001
From: bitraid <bitraid@protonmail.ch>
Date: Thu, 3 May 2018 15:50:18 +0300
Subject: [PATCH] Move file_version_info.txt to misc/ and add it to .gitignore

---
 .gitignore                     |  1 +
 file_version_info.txt          | 45 ----------------------------------
 misc/qutebrowser.spec          |  2 +-
 scripts/dev/gen_versioninfo.py |  2 +-
 4 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 file_version_info.txt

diff --git a/.gitignore b/.gitignore
index 85233aa2f..b41285fd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ TODO
 /scripts/testbrowser/cpp/webengine/testbrowser
 /scripts/testbrowser/cpp/webengine/.qmake.stash
 /scripts/dev/pylint_checkers/qute_pylint.egg-info
+/misc/file_version_info.txt
diff --git a/file_version_info.txt b/file_version_info.txt
deleted file mode 100644
index a82dd4c93..000000000
--- a/file_version_info.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-# UTF-8
-#
-# For more details about fixed file info 'ffi' see:
-# http://msdn.microsoft.com/en-us/library/ms646997.aspx
-VSVersionInfo(
-  ffi=FixedFileInfo(
-    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
-    # Set not needed items to zero 0.
-    filevers=(1, 2, 1, 0),
-    prodvers=(1, 2, 1, 0),
-    # Contains a bitmask that specifies the valid bits 'flags'r
-    mask=0x3f,
-    # Contains a bitmask that specifies the Boolean attributes of the file.
-    flags=0x0,
-    # The operating system for which this file was designed.
-    # 0x4 - NT and there is no need to change it.
-    OS=0x40004,
-    # The general type of file.
-    # 0x1 - the file is an application.
-    fileType=0x1,
-    # The function of the file.
-    # 0x0 - the function is not defined for this fileType
-    subtype=0x0,
-    # Creation date and time stamp.
-    date=(0, 0)
-    ),
-  kids=[
-    StringFileInfo(
-      [
-      StringTable(
-        u'040904B0',
-        [StringStruct(u'Comments', u'A keyboard-focused browser with a minimal GUI.'),
-        StringStruct(u'CompanyName', u'qutebrowser.org'),
-        StringStruct(u'FileDescription', u'qutebrowser'),
-        StringStruct(u'FileVersion', u'1.2.1'),
-        StringStruct(u'InternalName', u'qutebrowser'),
-        StringStruct(u'LegalCopyright', u'© 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>'),
-        StringStruct(u'LegalTrademarks', u'qutebrowser is free software under the GNU General Public License'),
-        StringStruct(u'OriginalFilename', u'qutebrowser.exe'),
-        StringStruct(u'ProductName', u'qutebrowser'),
-        StringStruct(u'ProductVersion', u'1.2.1')])
-      ]), 
-    VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
-  ]
-)
diff --git a/misc/qutebrowser.spec b/misc/qutebrowser.spec
index 50a6ff888..c886fb0c4 100644
--- a/misc/qutebrowser.spec
+++ b/misc/qutebrowser.spec
@@ -60,7 +60,7 @@ exe = EXE(pyz,
           strip=False,
           upx=False,
           console=False,
-          version='file_version_info.txt' )
+          version='misc/file_version_info.txt')
 coll = COLLECT(exe,
                a.binaries,
                a.zipfiles,
diff --git a/scripts/dev/gen_versioninfo.py b/scripts/dev/gen_versioninfo.py
index 6d7188880..afdb09fb2 100644
--- a/scripts/dev/gen_versioninfo.py
+++ b/scripts/dev/gen_versioninfo.py
@@ -30,7 +30,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
 
 import qutebrowser
 
-out_filename = 'file_version_info.txt'
+out_filename = 'misc/file_version_info.txt'
 
 filevers = qutebrowser.__version_info__ + (0,)
 prodvers = qutebrowser.__version_info__ + (0,)