Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
9a1b2970
Kaydet (Commit)
9a1b2970
authored
Haz 09, 2014
tarafından
Andrzej Hunt
Kaydeden (comit)
Michael Meeks
Haz 11, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Move liblibreoffice into LibreOfficeKit.
Change-Id: Ib2754a77be470faaa6f9b27644a1d8dd082ed2b8
üst
bb761be4
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
52 additions
and
27 deletions
+52
-27
RepositoryModule_host.mk
RepositoryModule_host.mk
+1
-0
Module_desktop.mk
desktop/Module_desktop.mk
+0
-6
init.cxx
desktop/source/lib/init.cxx
+1
-1
LibreOfficeKit.h
include/LibreOfficeKit/LibreOfficeKit.h
+2
-2
LibreOfficeKit.hxx
include/LibreOfficeKit/LibreOfficeKit.hxx
+3
-3
Library_libreofficekit.mk
libreofficekit/Library_libreofficekit.mk
+10
-11
Makefile
libreofficekit/Makefile
+14
-0
Module_libreofficekit.mk
libreofficekit/Module_libreofficekit.mk
+18
-0
shim.c
libreofficekit/source/shim.c
+1
-1
Executable_libtest.mk
smoketest/Executable_libtest.mk
+1
-2
libtest.cxx
smoketest/libtest.cxx
+1
-1
No files found.
RepositoryModule_host.mk
Dosyayı görüntüle @
9a1b2970
...
@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
...
@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
jvmaccess
\
jvmaccess
\
jvmfwk
\
jvmfwk
\
librelogo
\
librelogo
\
libreofficekit
\
lingucomponent
\
lingucomponent
\
linguistic
\
linguistic
\
lotuswordpro
\
lotuswordpro
\
...
...
desktop/Module_desktop.mk
Dosyayı görüntüle @
9a1b2970
...
@@ -29,12 +29,6 @@ $(eval $(call gb_Module_add_l10n_targets,desktop,\
...
@@ -29,12 +29,6 @@ $(eval $(call gb_Module_add_l10n_targets,desktop,\
UIConfig_deployment \
UIConfig_deployment \
))
))
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_targets,desktop,\
Library_libreoffice \
))
endif
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
$(eval $(call gb_Module_add_targets,desktop,\
Executable_soffice_bin \
Executable_soffice_bin \
...
...
desktop/source/lib/init.cxx
Dosyayı görüntüle @
9a1b2970
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
#include <string.h>
#include <string.h>
#include <stdlib.h>
#include <stdlib.h>
#include
"liblibreoffice.h"
#include
<LibreOfficeKit/LibreOfficeKit.h>
#include <tools/errinf.hxx>
#include <tools/errinf.hxx>
#include <osl/file.hxx>
#include <osl/file.hxx>
...
...
desktop/inc/liblibreoffice
.h
→
include/LibreOfficeKit/LibreOfficeKit
.h
Dosyayı görüntüle @
9a1b2970
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
*/
#ifndef INCLUDED_DESKTOP_INC_LIB
LIBREOFFICE
_H
#ifndef INCLUDED_DESKTOP_INC_LIB
REOFFICEKIT
_H
#define INCLUDED_DESKTOP_INC_LIB
LIBREOFFICE
_H
#define INCLUDED_DESKTOP_INC_LIB
REOFFICEKIT
_H
#ifdef __cplusplus
#ifdef __cplusplus
extern
"C"
extern
"C"
...
...
desktop/inc/liblibreoffice
.hxx
→
include/LibreOfficeKit/LibreOfficeKit
.hxx
Dosyayı görüntüle @
9a1b2970
...
@@ -7,10 +7,10 @@
...
@@ -7,10 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
*/
#ifndef INCLUDED_DESKTOP_INC_LIB
LIBREOFFICE
_HXX
#ifndef INCLUDED_DESKTOP_INC_LIB
REOFFICEKIT
_HXX
#define INCLUDED_DESKTOP_INC_LIB
LIBREOFFICE
_HXX
#define INCLUDED_DESKTOP_INC_LIB
REOFFICEKIT
_HXX
#include "
liblibreoffice
.h"
#include "
LibreOfficeKit
.h"
/*
/*
* The reasons this C++ code is not as pretty as it could be are:
* The reasons this C++ code is not as pretty as it could be are:
...
...
desktop/Library_libreoffice
.mk
→
libreofficekit/Library_libreofficekit
.mk
Dosyayı görüntüle @
9a1b2970
...
@@ -7,26 +7,25 @@
...
@@ -7,26 +7,25 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
$(eval $(call gb_StaticLibrary_StaticLibrary,libreoffice))
$(eval $(call gb_StaticLibrary_StaticLibrary,libreoffice
kit
))
$(eval $(call gb_StaticLibrary_set_include,libreoffice,\
$(eval $(call gb_StaticLibrary_set_include,libreoffice
kit
,\
$$(INCLUDE) \
$$(INCLUDE) \
-I$(SRCDIR)/desktop/inc \
))
))
$(eval $(call gb_StaticLibrary_add_libs,libreoffice,\
$(eval $(call gb_StaticLibrary_add_libs,libreoffice
kit
,\
$(if $(filter $(OS),LINUX), \
$(if $(filter $(OS),LINUX), \
-ldl \
-ldl \
-lpthread \
-lpthread \
) \
) \
))
))
$(eval $(call gb_StaticLibrary_use_libraries,libreoffice,\
$(eval $(call gb_StaticLibrary_use_libraries,libreoffice
kit
,\
$(gb_UWINAPI) \
$(gb_UWINAPI) \
))
))
$(eval $(call gb_StaticLibrary_add_cobjects,libreoffice,\
$(eval $(call gb_StaticLibrary_add_cobjects,libreoffice
kit
,\
desktop/source/lib
/shim \
libreofficekit/source
/shim \
))
))
# vim: set noet sw=4 ts=4:
# vim: set noet sw=4 ts=4:
libreofficekit/Makefile
0 → 100644
Dosyayı görüntüle @
9a1b2970
# -*- 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/.
#
module_directory
:=
$
(
dir
$
(
realpath
$
(
firstword
$(MAKEFILE_LIST)
)))
include
$(module_directory)/../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:
libreofficekit/Module_libreofficekit.mk
0 → 100644
Dosyayı görüntüle @
9a1b2970
# -*- 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_Module_Module,libreofficekit))
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_targets,libreofficekit,\
Library_libreofficekit \
))
endif
# vim: set ts=4 sw=4 et:
desktop/source/lib
/shim.c
→
libreofficekit/source
/shim.c
Dosyayı görüntüle @
9a1b2970
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#include <osl/module.h>
#include <osl/module.h>
#include <sal/types.h>
#include <sal/types.h>
#include <
liblibreoffice
.h>
#include <
LibreOfficeKit/LibreOfficeKit
.h>
#include <dlfcn.h>
#include <dlfcn.h>
#ifdef AIX
#ifdef AIX
...
...
smoketest/Executable_libtest.mk
Dosyayı görüntüle @
9a1b2970
...
@@ -11,7 +11,6 @@ $(eval $(call gb_Executable_Executable,libtest))
...
@@ -11,7 +11,6 @@ $(eval $(call gb_Executable_Executable,libtest))
$(eval $(call gb_Executable_set_include,libtest,\
$(eval $(call gb_Executable_set_include,libtest,\
$$(INCLUDE) \
$$(INCLUDE) \
-I$(SRCDIR)/desktop/inc \
))
))
$(eval $(call gb_Executable_use_libraries,libtest,\
$(eval $(call gb_Executable_use_libraries,libtest,\
...
@@ -19,7 +18,7 @@ $(eval $(call gb_Executable_use_libraries,libtest,\
...
@@ -19,7 +18,7 @@ $(eval $(call gb_Executable_use_libraries,libtest,\
))
))
$(eval $(call gb_Executable_use_static_libraries,libtest,\
$(eval $(call gb_Executable_use_static_libraries,libtest,\
libreoffice \
libreoffice
kit
\
))
))
$(eval $(call gb_Executable_add_libs,libtest,\
$(eval $(call gb_Executable_add_libs,libtest,\
...
...
smoketest/libtest.cxx
Dosyayı görüntüle @
9a1b2970
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
#include <assert.h>
#include <assert.h>
#include <math.h>
#include <math.h>
#include <sys/time.h>
#include <sys/time.h>
#include <
liblibreoffice
.hxx>
#include <
LibreOfficeKit/LibreOfficeKit
.hxx>
long
getTimeMS
()
long
getTimeMS
()
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment