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
0ffe0bf6
Kaydet (Commit)
0ffe0bf6
authored
Ara 02, 2014
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fold URE: Remove OO_SDK_URE_HOME on non-Windows
Change-Id: Iad0480eb39e2c1312c27cf9b90146c2beba592fd
üst
ce0513a9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
33 deletions
+11
-33
distro-install-sdk
bin/distro-install-sdk
+0
-1
configure.pl
odk/config/configure.pl
+0
-4
setsdkenv_unix.sh.in
odk/config/setsdkenv_unix.sh.in
+4
-9
install.html
odk/docs/install.html
+6
-16
settings.mk
odk/settings/settings.mk
+1
-3
No files found.
bin/distro-install-sdk
Dosyayı görüntüle @
0ffe0bf6
...
@@ -68,7 +68,6 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
...
@@ -68,7 +68,6 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
sed
-e
"s,@OO_SDK_NAME@,openoffice.org
${
PRODUCTVERSION
}
_sdk,"
\
sed
-e
"s,@OO_SDK_NAME@,openoffice.org
${
PRODUCTVERSION
}
_sdk,"
\
-e
"s,@OO_SDK_HOME@,
$INSTALLDIR
/sdk,"
\
-e
"s,@OO_SDK_HOME@,
$INSTALLDIR
/sdk,"
\
-e
"s,@OFFICE_HOME@,
$INSTALLDIR
,"
\
-e
"s,@OFFICE_HOME@,
$INSTALLDIR
,"
\
-e
"s,@OO_SDK_URE_HOME@,
$INSTALLDIR
/ure-link,"
\
-e
"s,@OO_SDK_MAKE_HOME@,/usr/bin,"
\
-e
"s,@OO_SDK_MAKE_HOME@,/usr/bin,"
\
-e
"s,@OO_SDK_ZIP_HOME@,/usr/bin,"
\
-e
"s,@OO_SDK_ZIP_HOME@,/usr/bin,"
\
-e
"s,@OO_SDK_CPP_HOME@,/usr/bin,"
\
-e
"s,@OO_SDK_CPP_HOME@,/usr/bin,"
\
...
...
odk/config/configure.pl
Dosyayı görüntüle @
0ffe0bf6
...
@@ -114,7 +114,6 @@ if ( $main::operatingSystem =~ m/darwin/ )
...
@@ -114,7 +114,6 @@ if ( $main::operatingSystem =~ m/darwin/ )
}
}
}
}
$
main::
OO_SDK_URE_HOME
=
"$main::OFFICE_HOME/Contents"
;
}
else
}
else
{
{
$
main::
OFFICE_HOME_SUGGESTION
=
searchoffice
();
$
main::
OFFICE_HOME_SUGGESTION
=
searchoffice
();
...
@@ -184,8 +183,6 @@ if ( $main::operatingSystem =~ m/darwin/ )
...
@@ -184,8 +183,6 @@ if ( $main::operatingSystem =~ m/darwin/ )
}
}
}
}
}
}
$
main::
OO_SDK_URE_HOME
=
"$main::OFFICE_HOME"
;
}
}
# prepare GNU make path
# prepare GNU make path
...
@@ -768,7 +765,6 @@ sub prepareScriptFile()
...
@@ -768,7 +765,6 @@ sub prepareScriptFile()
$_
=~
s
#\@OO_SDK_NAME\@#$main::OO_SDK_NAME#go;
$_
=~
s
#\@OO_SDK_NAME\@#$main::OO_SDK_NAME#go;
$_
=~
s
#\@OO_SDK_HOME\@#$main::OO_SDK_HOME#go;
$_
=~
s
#\@OO_SDK_HOME\@#$main::OO_SDK_HOME#go;
$_
=~
s
#\@OFFICE_HOME\@#$main::OFFICE_HOME#go;
$_
=~
s
#\@OFFICE_HOME\@#$main::OFFICE_HOME#go;
$_
=~
s
#\@OO_SDK_URE_HOME\@#$main::OO_SDK_URE_HOME#go;
$_
=~
s
#\@OO_SDK_MAKE_HOME\@#$main::OO_SDK_MAKE_HOME#go;
$_
=~
s
#\@OO_SDK_MAKE_HOME\@#$main::OO_SDK_MAKE_HOME#go;
$_
=~
s
#\@OO_SDK_ZIP_HOME\@#$main::OO_SDK_ZIP_HOME#go;
$_
=~
s
#\@OO_SDK_ZIP_HOME\@#$main::OO_SDK_ZIP_HOME#go;
$_
=~
s
#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go;
$_
=~
s
#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go;
...
...
odk/config/setsdkenv_unix.sh.in
Dosyayı görüntüle @
0ffe0bf6
...
@@ -32,11 +32,7 @@ OO_SDK_HOME='@OO_SDK_HOME@'
...
@@ -32,11 +32,7 @@ OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
# Office installation directory.
# Example: OFFICE_HOME=/opt/libreoffice
# Example: OFFICE_HOME=/opt/libreoffice
OFFICE_HOME
=
'@OFFICE_HOME@'
OFFICE_HOME
=
'@OFFICE_HOME@'
export
OFFICE_HOME
# URE installation directory.
# Example: OO_SDK_URE_HOME=/opt/libreoffice/ure
OO_SDK_URE_HOME
=
'@OO_SDK_URE_HOME@'
export
OO_SDK_URE_HOME
# Directory of the make command.
# Directory of the make command.
# Example: OO_SDK_MAKE_HOME=/usr/bin
# Example: OO_SDK_MAKE_HOME=/usr/bin
...
@@ -107,9 +103,9 @@ export UNO_PATH
...
@@ -107,9 +103,9 @@ export UNO_PATH
case
${
sdk_platform
}
in
case
${
sdk_platform
}
in
darwin
*
)
darwin
*
)
OO_SDK_URE_BIN_DIR
=
${
O
O_SDK_URE_HOME
}
/MacOS
OO_SDK_URE_BIN_DIR
=
${
O
FFICE_PROGRAM_PATH
}
OO_SDK_URE_LIB_DIR
=
${
O
O_SDK_URE_HOME
}
/Frameworks
OO_SDK_URE_LIB_DIR
=
${
O
FFICE_HOME
}
/Contents
/Frameworks
OO_SDK_URE_JAVA_DIR
=
${
O
O_SDK_URE_HOME
}
/Resources/java
OO_SDK_URE_JAVA_DIR
=
${
O
FFICE_HOME
}
/
${
sdk_lo_java_dir
}
;;
;;
*
)
*
)
OO_SDK_URE_BIN_DIR
=
${
OFFICE_PROGRAM_PATH
}
OO_SDK_URE_BIN_DIR
=
${
OFFICE_PROGRAM_PATH
}
...
@@ -294,7 +290,6 @@ echo " * SDK environment is prepared for ${platform}"
...
@@ -294,7 +290,6 @@ echo " * SDK environment is prepared for ${platform}"
echo
" *"
echo
" *"
echo
" * SDK =
$OO_SDK_HOME
"
echo
" * SDK =
$OO_SDK_HOME
"
echo
" * Office =
$OFFICE_HOME
"
echo
" * Office =
$OFFICE_HOME
"
echo
" * URE =
$OO_SDK_URE_HOME
"
echo
" * Make =
$OO_SDK_MAKE_HOME
"
echo
" * Make =
$OO_SDK_MAKE_HOME
"
echo
" * Zip =
$OO_SDK_ZIP_HOME
"
echo
" * Zip =
$OO_SDK_ZIP_HOME
"
echo
" * cat =
$OO_SDK_CAT_HOME
"
echo
" * cat =
$OO_SDK_CAT_HOME
"
...
...
odk/docs/install.html
Dosyayı görüntüle @
0ffe0bf6
...
@@ -239,12 +239,6 @@
...
@@ -239,12 +239,6 @@
users home directory for any generated output
users home directory for any generated output
when you use the SDK build environment.
</td>
when you use the SDK build environment.
</td>
</tr>
</tr>
<tr>
<td
class=
"cell20"
><b>
OO_SDK_URE_HOME
</b></td>
<td
class=
"cell80"
>
Path to an existing UNO
Runtime Environment installation, e.g.
"
/opt/libreoffice/ure
"
.
</td>
</tr>
<tr>
<tr>
<td
class=
"cell20"
><b>
OO_SDK_HOME
</b></td>
<td
class=
"cell20"
><b>
OO_SDK_HOME
</b></td>
<td
class=
"cell80"
>
Path to the SDK root
<td
class=
"cell80"
>
Path to the SDK root
...
@@ -346,24 +340,20 @@
...
@@ -346,24 +340,20 @@
<tr
valign=
"top"
>
<tr
valign=
"top"
>
<td
class=
"cell20"
>
OO_SDK_URE_BIN_DIR
</td>
<td
class=
"cell20"
>
OO_SDK_URE_BIN_DIR
</td>
<td
class=
"cell80"
>
The path within the chosen
<td
class=
"cell80"
>
The path within the chosen
URE installation where binary executables are
LibreOffice URE installation where binary
located (e.g.,
<i>
$OO_SDK_URE_HOME/bin
</i>
executables are located.
</td>
for a Unix installation).
</td>
</tr>
</tr>
<tr
valign=
"top"
>
<tr
valign=
"top"
>
<td
class=
"cell20"
>
OO_SDK_URE_LIB_DIR
</td>
<td
class=
"cell20"
>
OO_SDK_URE_LIB_DIR
</td>
<td
class=
"cell80"
>
The path within the chosen
<td
class=
"cell80"
>
The path within the chosen
URE installation where dynamic libraries are
LibreOffice URE installation where dynamic
located (e.g.,
<i>
$OO_SDK_URE_HOME/lib
</i>
libraries are located.
</td>
for a Unix installation).
</td>
</tr>
</tr>
<tr
valign=
"top"
>
<tr
valign=
"top"
>
<td
class=
"cell20"
>
OO_SDK_URE_JAVA_DIR
</td>
<td
class=
"cell20"
>
OO_SDK_URE_JAVA_DIR
</td>
<td
class=
"cell80"
>
The path within the chosen
<td
class=
"cell80"
>
The path within the chosen
URE installation where Java JARs are
LibreOffice URE installation where Java JARs
located (e.g.,
are located.
</td>
<i>
$OO_SDK_URE_HOME/share/java
</i>
for a Unix
installation).
</td>
</tr>
</tr>
<tr
valign=
"top"
>
<tr
valign=
"top"
>
<td
class=
"cell20"
>
CLASSPATH
</td>
<td
class=
"cell20"
>
CLASSPATH
</td>
...
...
odk/settings/settings.mk
Dosyayı görüntüle @
0ffe0bf6
...
@@ -451,9 +451,7 @@ EXE_LINK_FLAGS=$(GCC_ARCH_OPTION) -Wl,-multiply_defined,suppress
...
@@ -451,9 +451,7 @@ EXE_LINK_FLAGS=$(GCC_ARCH_OPTION) -Wl,-multiply_defined,suppress
LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)"
LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)"
LINK_JAVA_LIBS=-framework JavaVM
LINK_JAVA_LIBS=-framework JavaVM
ifneq "$(OO_SDK_URE_HOME)" ""
URE_MISC=$(OFFICE_HOME)/Contents/Resources/ure/share/misc
URE_MISC=$(OO_SDK_URE_HOME)/Resources/ure/share/misc
endif
endif
endif
...
...
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