[ooo-build-commit] .: 5 commits - configure.in Makefile.in scp2/source set_soenv.in solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Aug 26 07:24:36 PDT 2010
Makefile.in | 4 +-
configure.in | 6 ----
scp2/source/ooo/directory_ooo.scp | 5 +++
scp2/source/ooo/file_library_ooo.scp | 26 +++++++++++++++++
scp2/source/ooo/file_ooo.scp | 32 ++++++++++++++++++++++
set_soenv.in | 20 ++++++++-----
solenv/bin/modules/installer/windows/component.pm | 5 +++
solenv/bin/modules/installer/windows/directory.pm | 6 ++++
solenv/inc/libs.mk | 4 ++
9 files changed, 93 insertions(+), 15 deletions(-)
New commits:
commit f5bc19dc5c482ab5a0cf35c7c18e926e42bdb68f
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Aug 26 16:19:39 2010 +0200
Fix make dev-install.
diff --git a/Makefile.in b/Makefile.in
index f2af2e4..313f1e6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@ dev-install:
. ./*Env.Set.sh && \
cd $$SRC_ROOT/instsetoo_native/util && \
LOCALINSTALLDIR=$$SRC_ROOT/install dmake openoffice_en-US PKGFORMAT=installed && \
- $$SOLARENV/bin/linkoo $$SRC_ROOT/install/OpenOffice/installed/install/en-US/openoffice.org3 $$SRC_ROOT && \
+ $$SOLARENV/bin/linkoo $$SRC_ROOT/install/OpenOffice/installed/install/en-US $$SRC_ROOT && \
echo && \
echo "Developer installation finished, you can find it here:" && \
- echo "$$SRC_ROOT/install/OpenOffice/installed/install/en-US/openoffice.org3"
+ echo "$$SRC_ROOT/install/OpenOffice/installed/install/en-US"
commit ded0312f038a4f7bf72ffafaa6d6167e798fedda
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Aug 26 09:41:21 2010 +0200
Decrease verbosity of the configuration process.
diff --git a/configure.in b/configure.in
index 3c6a88e..243b5b3 100644
--- a/configure.in
+++ b/configure.in
@@ -7014,11 +7014,7 @@ AC_SUBST(BUILD_MAX_JOBS)
dnl ===================================================================
dnl Setting up the environment.
dnl ===================================================================
-echo "********************************************************************"
-echo "* *"
-echo "* Setting up the build environment variables. *"
-echo "* *"
-echo "********************************************************************"
+echo "setting up the build environment variables..."
if test -z "$COMPATH"; then
AC_MSG_ERROR([No compiler found.])
diff --git a/set_soenv.in b/set_soenv.in
index 6c2c09f..3340c71 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1935,7 +1935,7 @@ ToFile( "XAU_LIBS", "@XAU_LIBS@", "e" );
ToFile( "GXX_INCLUDE_PATH", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
if ($platform !~ m/cygwin|os2/) {
- if ( $ENV{"TMPDIR"} eq "" ) {
+ if ( !defined $ENV{"TMPDIR"} || $ENV{"TMPDIR"} eq "" ) {
ToFile( "TMPDIR", "/tmp", "e" );
} else {
ToFile( "TMPDIR", "$ENV{'TMPDIR'}", "e" );
@@ -2081,6 +2081,7 @@ if (rename( $outfile_sh, $tmp ) ne 1)
#--------------------------------------------------------
#
#
+print "$newline";
print "*********************************************************".
"******************* $newline"."*"."$newline";
print "* OpenOffice.org $UPD configuration. $newline";
@@ -2231,29 +2232,32 @@ sub ToFile {
$envvar =~ s/\\/\\\\/g;
$envvarbash = $envvar;
- printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar);
+ printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar) if ( '@VERBOSE@' eq 'TRUE' );
print OUT "$setenv $_[ 0 ] \"$envvar\"$newline"; # to tcsh file
print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline"; # to sh file
$exportvars .= " $_[ 0 ]"; # add to export list for sh file
} else {
- printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout
+ printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") if ( '@VERBOSE@' eq 'TRUE' );
$unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file
$unsetvarssh .= " $_[ 0 ]"; # for sh file
}
}
elsif ( $_[ 2 ] eq "a" )
{ # Write an alias to file.
- print "The $_[ 0 ] is set to: $_[ 1 ]\n"; # to stdout
+ print "The $_[ 0 ] is set to: $_[ 1 ]\n" if ( '@VERBOSE@' eq 'TRUE' ); # to stdout
print OUT "$_[ 0 ] $_[ 1 ]$newline"; # to tcsh file
print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline"; # to sh file
}
elsif ( $_[ 2 ] eq "c" )
{ # Write a comment to file.
- print "$newline";
- print "$comment$newline";
- print "$comment $_[ 0 ]$newline";
- print "$comment$newline";
+ if ( '@VERBOSE@' eq 'TRUE' )
+ {
+ print "$newline";
+ print "$comment$newline";
+ print "$comment $_[ 0 ]$newline";
+ print "$comment$newline";
+ }
print OUT "$newline";
print OUT "$comment$newline";
print OUT "$comment $_[ 0 ]$newline";
commit 4658a270abfc7306939c6bf6f73230c8c5cc13c9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 25 22:27:14 2010 +0200
novell-win32-odma.diff: ODMA dialog implementation.
i#6885, i#32741
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 5bcd887..ff9484a 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -163,6 +163,11 @@ Directory gid_Dir_Shellnew
DosName = "shellnew";
End
+Directory gid_Dir_ShellnewToo
+ ParentID = gid_Dir_Program;
+ DosName = "shellnew2";
+End
+
#endif
Directory gid_Dir_User
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b6db7c7..3c5eea9 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -621,6 +621,10 @@ End
#endif
#endif
+#ifdef WNT
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
+#endif
+
SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
@@ -1507,6 +1511,10 @@ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
+#ifdef WNT
+SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
+#endif
+
File gid_File_Lib_Lnth
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 718f7da..ceeeeed 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1280,24 +1280,56 @@ End
STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
+File gid_File_Shellnew2_Ods_Soffice
+ TXT_FILE_BODY;
+ Styles = (PACKED,WORKSTATION, OVERWRITE);
+ Dir = PREDEFINED_OSWINSHELLNEWDIR;
+ NetDir = gid_Dir_ShellnewToo;
+ Name = "soffice.ods";
+End
+
#endif
#ifdef WNT
STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
+File gid_File_Shellnew2_Odg_Soffice
+ TXT_FILE_BODY;
+ Styles = (PACKED,WORKSTATION, OVERWRITE);
+ Dir = PREDEFINED_OSWINSHELLNEWDIR;
+ NetDir = gid_Dir_ShellnewToo;
+ Name = "soffice.odg";
+End
+
#endif
#ifdef WNT
STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
+File gid_File_Shellnew2_Odp_Soffice
+ TXT_FILE_BODY;
+ Styles = (PACKED,WORKSTATION, OVERWRITE);
+ Dir = PREDEFINED_OSWINSHELLNEWDIR;
+ NetDir = gid_Dir_ShellnewToo;
+ Name = "soffice.odp";
+End
+
#endif
#ifdef WNT
STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
+File gid_File_Shellnew2_Odt_Soffice
+ TXT_FILE_BODY;
+ Styles = (PACKED,WORKSTATION, OVERWRITE);
+ Dir = PREDEFINED_OSWINSHELLNEWDIR;
+ NetDir = gid_Dir_ShellnewToo;
+ Name = "soffice.odt";
+End
+
#endif
#ifdef UNX
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index c507fd6..f2a310a 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -128,6 +128,11 @@ sub get_file_component_directory
return $installer::globals::templatefolder;
}
+ if ( $destdir =~ /\bPREDEFINED_OSWINSHELLNEWDIR\b/ )
+ {
+ return "WindowsShellNewFolder";
+ }
+
my $destination = $onefile->{'destination'};
installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index e78f0ae..c835b1e 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -361,6 +361,12 @@ sub add_root_directories
$oneline = "TARGETDIR\t\tSourceDir\n";
push(@{$directorytableref}, $oneline);
+ $oneline = "WindowsFolder\tTARGETDIR\tWindows\n";
+ push(@{$directorytableref}, $oneline);
+
+ $oneline = "WindowsShellNewFolder\tWindowsFolder\tShellNew\n";
+ push(@{$directorytableref}, $oneline);
+
$oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
push(@{$directorytableref}, $oneline);
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 09b6df9..7e355b2 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -28,6 +28,9 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+# No ODMA on UNX
+ODMA_LIB_LIB=
+
#
#externe libs in plattform.mk
#
@@ -357,6 +360,7 @@ TESTLIB=-ltest
.ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+ODMA_LIB_LIB=odma_lib.lib
AWTLIB*=jawt.lib
AVMEDIALIB=iavmedia.lib
ICUINLIB=icuin.lib
commit 4c914b2b6890e7eddd0ba8501db51cb881cab49a
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 17:56:07 2010 +0200
fpicker-kde-3layer.diff: Fix the KDE fpicker for 3layer OOo.
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index f329658..b6db7c7 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -585,7 +585,7 @@ End
File gid_File_Bin_KdeFilePicker
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "kdefilepicker";
End
#endif
commit da7b4f6a8fa25d611ad28877df5616ab078fb9e6
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 17:55:34 2010 +0200
fpicker-common-scp2.diff: Let the KDE and Gtk+ fpickers build and install.
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 404a158..f329658 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -572,6 +572,24 @@ File gid_File_Lib_Fps_Kde4
End
#endif
#endif
+#ifdef ENABLE_KDE
+#ifndef MACOSX
+File gid_File_Lib_Fps_Kde
+ TXT_FILE_BODY;
+ Styles = (PACKED,UNO_COMPONENT);
+ RegistryID = gid_Starregistry_Services_Rdb;
+ Dir = gid_Dir_Program;
+ Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
+ Regmergefile = "fps-kde-ucd.txt";
+End
+File gid_File_Bin_KdeFilePicker
+ BIN_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Program;
+ Name = "kdefilepicker";
+End
+#endif
+#endif
#endif
#ifdef MACOSX
More information about the ooo-build-commit
mailing list