Skip to content

C
core
Kaydet (Commit) eb6fa6be authored tarafından Andras Timar's avatar Andras Timar
Dosyalara gözat
Seçenekler

remove thesaurus indexer CustomAction 

It was never integrated and used. If we made the effort to integrate it,
Windows installer would be a few megabytes smaller, because indexes of
thesauri would be generated in install time (instead of packaging
pre-generated indexes).

However, the cons are:
* untested
* presumably slows down instal process which is slow already
* adds complexity to installer which is too complex already
* indexes will not be there in case of administrative install (QA)
* bad experiences with CustomActions that manipulate the installed
  application (various, weird permission problems)

Change-Id: I3989b835b1250718bc03107a3807d091e7a9aa0e
üst 33fcc140
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 230 deletions
setup_native/Library_thidxmsi.mk deleted 100644 → 0
Dosyayı görüntüle @ 33fcc140
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# 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/.
#
$(eval $(call gb_Library_Library,thidxmsi))
$(eval $(call gb_Library_add_defs,thidxmsi,\
-D_STLP_USE_STATIC_LIB \
))
$(eval $(call gb_Library_add_exception_objects,thidxmsi,\
setup_native/source/win32/customactions/thesaurus/thesaurus \
))
$(eval $(call gb_Library_use_system_win32_libs,thidxmsi,\
msi \
kernel32 \
user32 \
advapi32 \
shell32 \
))
# vim: set noet sw=4 ts=4:
setup_native/Module_setup_native.mk
Dosyayı görüntüle @ eb6fa6be
......@@ -40,7 +40,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\
Library_sellangmsi \
Library_shlxtmsi \
Library_sn_tools \
Library_thidxmsi \
StaticLibrary_quickstarter \
StaticLibrary_seterror \
))
......
setup_native/source/win32/customactions/thesaurus/thesaurus.cxx deleted 100644 → 0
Dosyayı görüntüle @ 33fcc140
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* 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/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#define WIN32_LEAN_AND_MEAN
#define _WIN32_WINNT 0x0500
#undef WINVER
#define WINVER 0x0500
#include <windows.h>
#include <msiquery.h>
#include <malloc.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <systools/win32/uwinapi.h>
#include <io.h>
#include <iostream>
#include <fstream>
#include <string>
#include <map>
#include <vector>
#include <stdlib.h>
#include <string.h>
using namespace std;
namespace
{
string GetMsiProperty(MSIHANDLE handle, const string& sProperty)
{
string result;
TCHAR szDummy[1] = TEXT("");
DWORD nChars = 0;
if (MsiGetProperty(handle, sProperty.c_str(), szDummy, &nChars) == ERROR_MORE_DATA)
{
DWORD nBytes = ++nChars * sizeof(TCHAR);
LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
ZeroMemory( buffer, nBytes );
MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
result = buffer;
}
return result;
}
inline bool IsSetMsiProperty(MSIHANDLE handle, const string& sProperty)
{
return (GetMsiProperty(handle, sProperty).length() > 0);
}
inline void UnsetMsiProperty(MSIHANDLE handle, const string& sProperty)
{
MsiSetProperty(handle, sProperty.c_str(), NULL);
}
inline void SetMsiProperty(MSIHANDLE handle, const string& sProperty, const string&)
{
MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
}
static const int MAXLINE = 1024*64;
void generateIndex(const char *inputFile, const char *outputFile)
{
ifstream in(inputFile);
char inputBuffer[MAXLINE];
map<string, size_t> entries;
map<string,size_t>::iterator ret(entries.begin());
int line(1);
in.getline(inputBuffer, MAXLINE);
const string encoding(inputBuffer);
size_t currentOffset(encoding.size()+1);
while (true)
{
// Extract the next word, but not the entry count
in.getline(inputBuffer, MAXLINE, '|');
if (in.eof()) break;
string word(inputBuffer);
ret = entries.insert(ret, pair<string, size_t>(word, currentOffset));
currentOffset += word.size() + 1;
// Next is the entry count
in.getline(inputBuffer, MAXLINE);
if (!in.good())
{
return;
}
currentOffset += strlen(inputBuffer)+1;
int entryCount(strtol(inputBuffer, NULL, 10));
for (int i(0); i < entryCount; ++i)
{
in.getline(inputBuffer, MAXLINE);
currentOffset += strlen(inputBuffer)+1;
++line;
}
}
// Use binary mode to prevent any translation of LF to CRLF on Windows
ofstream outputStream(outputFile, ios_base::binary| ios_base::trunc|ios_base::out);
if (!outputStream.is_open())
{
//cerr << "Unable to open output file " << outputFile << endl;
return;
}
cerr << "Doing it now" << outputFile << endl;
outputStream << encoding << '\n' << entries.size() << '\n';
for (map<string, size_t>::const_iterator ii(entries.begin());
ii != entries.end();
++ii
)
{
outputStream << ii->first << '|' << ii->second << '\n';
}
outputStream.close();
}
void generateIndex(const string &datFile)
{
string idxFile(datFile.substr(0, datFile.size()-3)+"idx");
generateIndex(datFile.c_str(), idxFile.c_str());
}
void createIndexesForThesaurusFiles(const string & sOfficeInstallPath)
{
vector<string> thesaurusPaths;
string sExtensionsPath = sOfficeInstallPath + "\\share\\extensions\\";
string dictionariesWildcard = sExtensionsPath + "dict-*";
struct _finddatai64_t dictFind;
long h = _findfirsti64(dictionariesWildcard.c_str(),&dictFind);
if (h > 0)
{
do
{
if (dictFind.attrib & _A_SUBDIR)
{
struct _finddatai64_t datFind;
// Find any .dat files in the subdirectory
string dictPath = sExtensionsPath + dictFind.name + "\\";
string datWildCard = dictPath + "*.dat";
long h2 = _findfirsti64(datWildCard.c_str(), &datFind);
if (h2 > 0)
{
do
{
thesaurusPaths.push_back(dictPath + datFind.name);
} while (_findnexti64(h2,&datFind) == 0);
}
}
} while (_findnexti64(h,&dictFind) == 0);
}
for (vector<string>::const_iterator ii(thesaurusPaths.begin());
ii != thesaurusPaths.end();
++ii
)
{
generateIndex(*ii);
}
}
} // namespace
// Creates the thesaurus .idx files for all installed .dat
// thesaurus files
extern "C" __declspec(dllexport) UINT __stdcall CreateIndexes( MSIHANDLE handle )
{
string sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
createIndexesForThesaurusFiles(sOfficeInstallPath);
return ERROR_SUCCESS;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment