Repository.mk | 5
RepositoryFixes.mk | 2
registry/Executable_rdbedit.mk | 43 -----
registry/Module_registry.mk | 1
registry/tools/rdbedit.cxx | 318 -----------------------------------------
registry/version.mk | 39 -----
6 files changed, 4 insertions(+), 404 deletions(-)
New commits:
commit a09b25f520594410d4851b2e435223aa0627078e
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun May 6 11:23:55 2012 +0200
register reg and store the same way as jvmfwk
Change-Id: I054d9ac210051d42b47188489d2d67fbbd3ed0e9
diff --git a/Repository.mk b/Repository.mk
index cf7c0a8..68a8890 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -376,9 +376,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
juh \
juhx \
log_uno \
- reg \
sal_textenc \
- store \
sunjavaplugin \
unsafe_uno \
xmlreader \
@@ -563,7 +561,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
cppu \
jvmfwk \
+ reg \
sal \
+ store \
))
$(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 77c51be..dfdba60 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -38,7 +38,9 @@ gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_c
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
ifneq ($(OS),ANDROID)
gb_Library_FILENAMES := $(patsubst
unobootstrapprotector:libuno%,unobootstrapprotector:uno%,$(gb_Library_FILENAMES))
commit b20cb1e13270a30c676b477954b9e613f083cb32
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun May 6 11:23:22 2012 +0200
remove unused files
Change-Id: I65ec941f72b9884d147f51939d592da313418329
diff --git a/Repository.mk b/Repository.mk
index 2075275..cf7c0a8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
osl_process_child \
pdf2xml \
pdfunzip \
- rdbedit \
rdbmaker \
regsingleton \
rsc \
diff --git a/registry/Executable_rdbedit.mk b/registry/Executable_rdbedit.mk
deleted file mode 100644
index a9b31ff..0000000
--- a/registry/Executable_rdbedit.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrov...@gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Executable_Executable,rdbedit))
-
-$(eval $(call gb_Executable_use_libraries,rdbedit,\
- sal \
- salhelper \
- reg \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,rdbedit,\
- registry_helper \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,rdbedit,\
- registry/tools/rdbedit \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 066e2fd..0867564 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Module_add_targets,registry,\
Executable_regview \
Executable_regcompare \
Executable_checksingleton \
- Executable_rdbedit \
))
endif
diff --git a/registry/tools/rdbedit.cxx b/registry/tools/rdbedit.cxx
deleted file mode 100644
index ef7555a..0000000
--- a/registry/tools/rdbedit.cxx
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <stdio.h>
-#include <string.h>
-
-#include "registry/registry.hxx"
-#include "registry/reflread.hxx"
-#include <rtl/ustring.hxx>
-#include <rtl/alloc.h>
-#include <osl/process.h>
-#include <osl/diagnose.h>
-#include <osl/thread.h>
-#include <osl/file.hxx>
-
-#ifdef SAL_UNX
-#define SEPARATOR '/'
-#else
-#define SEPARATOR '\\'
-#endif
-
-using namespace ::rtl;
-using namespace ::osl;
-
-sal_Bool isFileUrl(const OString& fileName)
-{
- if (fileName.indexOf("file://") == 0 )
- return sal_True;
- return sal_False;
-}
-
-OUString convertToFileUrl(const OString& fileName)
-{
- if ( isFileUrl(fileName) )
- {
- return OStringToOUString(fileName, osl_getThreadTextEncoding());
- }
-
- OUString uUrlFileName;
- OUString uFileName(fileName.getStr(), fileName.getLength(),
osl_getThreadTextEncoding());
- if ( fileName.indexOf('.') == 0 || fileName.indexOf(SEPARATOR) < 0 )
- {
- OUString uWorkingDir;
- if (osl_getProcessWorkingDir(&uWorkingDir.pData) != osl_Process_E_None)
- {
- OSL_ASSERT(false);
- }
- if (FileBase::getAbsoluteFileURL(uWorkingDir, uFileName, uUrlFileName)
- != FileBase::E_None)
- {
- OSL_ASSERT(false);
- }
- } else
- {
- if (FileBase::getFileURLFromSystemPath(uFileName, uUrlFileName)
- != FileBase::E_None)
- {
- OSL_ASSERT(false);
- }
- }
-
- return uUrlFileName;
-}
-
-#define U2S( s ) \
- OUStringToOString(s, RTL_TEXTENCODING_UTF8).getStr()
-#define S2U( s ) \
- OStringToOUString(s, RTL_TEXTENCODING_UTF8)
-
-struct LessString
-{
- sal_Bool operator()(const OUString& str1, const OUString& str2) const
- {
- return (str1 < str2);
- }
-};
-
-enum Command {
- DELETEKEY
-};
-
-class Options
-{
-public:
- Options()
- : m_bVerbose(false)
- {}
- ~Options()
- {}
-
- bool initOptions(int ac, char* av[]);
-
- OString prepareHelp();
- OString prepareVersion();
-
- const OString& getProgramName() const
- { return m_program; }
- const OString& getTypeReg() const
- { return m_typeRegName; }
- const OString& getKeyName() const
- { return m_keyName; }
- Command getCommand() const
- { return m_command; }
- bool verbose() const
- { return m_bVerbose; }
-protected:
- OString m_program;
- OString m_typeRegName;
- OString m_keyName;
- Command m_command;
- bool m_bVerbose;
-};
-
-bool Options::initOptions(int ac, char* av[])
-{
- bool bRet = true;
- sal_uInt16 i=1;
-
- if (ac < 2)
- {
- fprintf(stderr, "%s", prepareHelp().getStr());
- bRet = sal_False;
- }
-
- m_program = av[0];
- sal_Int32 index = -1;
- if ((index=m_program.lastIndexOf(SEPARATOR)) > 0)
- m_program = av[0]+index+1;
-
- char *s=NULL;
- for (; i < ac; i++)
- {
- if (av[i][0] == '-')
- {
- switch (av[i][1])
- {
- case 'r':
- case 'R':
- if (av[i][2] == '\0')
- {
- if (i < ac - 1 && av[i+1][0] != '-')
- {
- i++;
- s = av[i];
- } else
- {
- fprintf(stderr, "%s: invalid option '%s'\n",
m_program.getStr(), av[i]);
- bRet = sal_False;
- break;
- }
- } else
- {
- s = av[i] + 2;
- }
- m_typeRegName = OString(s);
- break;
- case 'd':
- case 'D':
- if (av[i][2] == '\0')
- {
- if (i < ac - 1 && av[i+1][0] != '-')
- {
- i++;
- s = av[i];
- } else
- {
- fprintf(stderr, "%s: invalid option '%s'\n",
m_program.getStr(), av[i]);
- bRet = sal_False;
- break;
- }
- } else
- {
- s = av[i] + 2;
- }
- m_keyName = OString(s);
- break;
- case 'v':
- case 'V':
- if (av[i][2] != '\0')
- {
- fprintf(stderr, "%s: invalid option '%s'\n",
m_program.getStr(), av[i]);
- bRet = sal_False;
- }
- m_bVerbose = true;
- break;
- case 'h':
- case '?':
- if (av[i][2] != '\0')
- {
- fprintf(stderr, "%s: invalid option '%s'\n",
m_program.getStr(), av[i]);
- bRet = false;
- } else
- {
- fprintf(stdout, "%s", prepareHelp().getStr());
- exit(0);
- }
- break;
- default:
- fprintf(stderr, "%s: unknown option '%s'\n",
m_program.getStr(), av[i]);
- bRet = false;
- break;
- }
- } else
- {
- fprintf(stderr, "%s: unknown option '%s'\n", m_program.getStr(),
av[i]);
- bRet = false;
- }
- }
-
- return bRet;
-}
-
-OString Options::prepareHelp()
-{
- OString help("\nusing: ");
- help += m_program + " -r<filename> <command>\n";
- help += " -r<filename> = filename specifies the name of the type
registry.\n";
- help += "Commands:\n";
- help += " -d <keyname> = delete the specified key from the registry.
Keyname\n";
- help += " specifies the name of the key that get
deleted.\n";
- help += " -v = verbose output.\n";
- help += " -h|-? = print this help message and exit.\n";
- help += prepareVersion();
-
- return help;
-}
-
-OString Options::prepareVersion()
-{
- OString version(m_program);
- version += " Version 1.0\n\n";
- return version;
-}
-
-static Options options;
-
-
-#if (defined UNX) || (defined __MINGW32__)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-{
- if ( !options.initOptions(argc, argv) )
- {
- exit(1);
- }
-
- OUString typeRegName( convertToFileUrl(options.getTypeReg()) );
-
- Registry typeReg;
-
- if ( typeReg.open(typeRegName, REG_READWRITE) )
- {
- fprintf(stderr, "%s: open registry \"%s\" failed\n",
- options.getProgramName().getStr(),
options.getTypeReg().getStr());
- exit(2);
- }
-
- RegistryKey typeRoot;
- if ( typeReg.openRootKey(typeRoot) )
- {
- fprintf(stderr, "%s: open root key of registry \"%s\" failed\n",
- options.getProgramName().getStr(),
options.getTypeReg().getStr());
- exit(3);
- }
-
- if ( options.getCommand() == DELETEKEY )
- {
- if ( typeRoot.deleteKey(S2U(options.getKeyName())) )
- {
- fprintf(stderr, "%s: delete key \"%s\" of registry \"%s\"
failed\n",
- options.getProgramName().getStr(),
options.getKeyName().getStr(), options.getTypeReg().getStr());
- exit(4);
- } else {
- if (options.verbose())
- fprintf(stderr, "%s: delete key \"%s\" of registry \"%s\"\n",
- options.getProgramName().getStr(),
options.getKeyName().getStr(), options.getTypeReg().getStr());
- }
- }
-
- typeRoot.releaseKey();
- if ( typeReg.close() )
- {
- fprintf(stderr, "%s: closing registry \"%s\" failed\n",
- options.getProgramName().getStr(),
options.getTypeReg().getStr());
- exit(5);
- }
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/version.mk b/registry/version.mk
deleted file mode 100644
index d4b56a3..0000000
--- a/registry/version.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# target
-REGISTRY_TARGET=reg
-
-# the major
-REGISTRY_MAJOR=2
-# the minor
-REGISTRY_MINOR=0
-# the micro
-REGISTRY_MICRO=0
-
-# this is a c++ compatible library
-REGISTRY_CPP=0
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
