corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1049311 - Remove sqlite resource files. r=mshal

Browse Source
This commit is contained in:
Mike Hommey
2014-08-07 02:59:29 +09:00
parent 57fab80d36
commit 3c1e4023c6
4 changed files with 0 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db/sqlite3/src/Makefile.in
View File

@@ -11,21 +11,15 @@ ifeq ($(OS_ARCH),WINNT)
DEFFILE = $(CURDIR)/sqlite-processed.def
GARBAGE += \
sqlite-version.h \
$(DEFFILE) \
$(NULL)
# We generate the appropriate version header file with our python script.
sqlite-version.h: sqlite-version.py sqlite3.h
$(PYTHON) $^ > $@
# We have to preprocess our def file because we need different symbols in debug
# builds exposed that are not built in non-debug builds.
$(DEFFILE): sqlite.def
@$(call py_action,preprocessor,$(DEFINES) $(XULPPFLAGS) \
$(srcdir)/sqlite.def -o $(DEFFILE))
export:: sqlite-version.h
else
ifndef MOZ_FOLD_LIBS
ifdef GCC_USE_GNU_LD

4
db/sqlite3/src/moz.build
View File

@@ -70,10 +70,6 @@ if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_MEMORY']:
if CONFIG['SOLARIS_SUNPRO_CC']:
NO_PGO = True
if CONFIG['OS_ARCH'] == 'WINNT':
RCFILE = 'sqlite.rc'
RESFILE = 'sqlite.res'
if CONFIG['OS_ARCH'] == 'Linux' and \
not CONFIG['MOZ_FOLD_LIBS'] and \
CONFIG['GCC_USE_GNU_LD']:

25
db/sqlite3/src/sqlite-version.py
View File

@@ -1,25 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
import sys
import re
# Define RegEx for finding and breaking apart SQLITE_VERSION string
versionString = "^#define SQLITE_VERSION\D*(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?\D*"
#Use command line argument pointing to sqlite3.h to open the file and use
#the RegEx to search for the line #define SQLITE_VERSION. When the RegEx
#matches and the line is found, print the version strings to the console
#with #definey goodness.
for line in open(sys.argv[1]):
result = re.search(versionString, line)
if result is not None: #If RegEx matches, print version numbers and stop
splitVersion = list(result.groups())
if splitVersion[3] is None: #Make 4th list element 0 if undefined
splitVersion[3:] = ['0']
print "#define SQLITE_VERSION_MAJOR " + splitVersion[0]
print "#define SQLITE_VERSION_MINOR " + splitVersion[1]
print "#define SQLITE_VERSION_PATCH " + splitVersion[2]
print "#define SQLITE_VERSION_SUBPATCH " + splitVersion[3]
break

45
db/sqlite3/src/sqlite.rc
View File

@@ -1,45 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "sqlite3.h"
#include "sqlite-version.h"
#include <winver.h>
#define SQLITE_COMPANY_NAME "sqlite.org"
#define SQLITE_INTERNAL_NAME "sqlite3"
#define SQLITE_FILEDESCRIPTION "SQLite Database Library"
#define MY_FILEOS VOS_NT_WINDOWS32
/////////////////////////////////////////////////////////////////////////////
//
// Version-information resource
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION SQLITE_VERSION_MAJOR,SQLITE_VERSION_MINOR,SQLITE_VERSION_PATCH,SQLITE_VERSION_SUBPATCH
PRODUCTVERSION SQLITE_VERSION_MAJOR,SQLITE_VERSION_MINOR,SQLITE_VERSION_PATCH,SQLITE_VERSION_SUBPATCH
FILEOS MY_FILEOS
FILETYPE VFT_DLL
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904B0" // Lang=US English, CharSet=Unicode
BEGIN
VALUE "CompanyName", SQLITE_COMPANY_NAME "\0"
VALUE "FileDescription", SQLITE_FILEDESCRIPTION "\0"
VALUE "FileVersion", SQLITE_VERSION "\0"
VALUE "InternalName", SQLITE_INTERNAL_NAME "\0"
VALUE "OriginalFilename", SQLITE_INTERNAL_NAME ".dll\0"
VALUE "ProductName", SQLITE_FILEDESCRIPTION "\0"
VALUE "ProductVersion", SQLITE_VERSION "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END