[Libreoffice-commits] core.git: 3 commits - scp2/source solenv/bin
Tor Lillqvist
tml at iki.fi
Thu May 16 06:22:15 PDT 2013
scp2/source/python/file_python.scp | 217 --------------------------
solenv/bin/modules/installer/filelists.pm | 2
solenv/bin/modules/installer/systemactions.pm | 9 -
solenv/bin/modules/installer/worker.pm | 13 +
4 files changed, 17 insertions(+), 224 deletions(-)
New commits:
commit 32e716528560c22c8ec881ed88fd7a99a27c9efd
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 16 16:03:03 2013 +0300
Entries for symlinks in the Python framework seem unnecessary now
Change-Id: I63e0ceb42db5c561cafaae160259ee7f2658552c
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 83324ed..f57d2d0 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -128,223 +128,6 @@ File gid_File_Share_Registry_Pyuno_Xcd
Name = "pyuno.xcd";
End
-#ifndef SYSTEM_PYTHON
-#ifdef MACOSX
-//directory entries solely to be able to create the symlinks
-Directory gid_Dir_PythonFramework
- ParentID = gid_Brand_Dir_Program;
- HostName = "LibreOfficePython.framework";
- Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions
- ParentID = gid_Dir_PythonFramework;
- HostName = "Versions";
- Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver
- ParentID = gid_Dir_PythonFramework_Versions;
- HostName = STRING(PYMAJMIN);
- Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_bin
- ParentID = gid_Dir_PythonFramework_Versions_ver;
- HostName = "bin";
- Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_include
- ParentID = gid_Dir_PythonFramework_Versions_ver;
- HostName = "include";
- Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_include_pythonver
- ParentID = gid_Dir_PythonFramework_Versions_ver_include;
- HostName = STRING(CONCAT3(python,PYMAJMIN,m));
- Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib
- ParentID = gid_Dir_PythonFramework_Versions_ver;
- HostName = "lib";
- Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig
- ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
- HostName = "pkgconfig";
- Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver
- ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
- HostName = STRING(CONCAT2(python,PYMAJMIN));
- Styles = (CREATE);
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config
- ParentID = gid_Dir_PythonFramework_Versions_ver_lib_pythonver;
- HostName = STRING(CONCAT3(config-,PYMAJMIN,m));
- Styles = (CREATE);
-End
-
-Unixlink gid_Unixlink_Python_Headers
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework;
- Name = "Headers";
- Target = "Versions/Current/Headers";
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_LibreOfficePython
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework;
- Name = "LibreOfficePython";
- Target = "Versions/Current/LibreOfficePython";
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_Resources
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework;
- Name = "Resources";
- Target = "Versions/Current/Resources";
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_Versions_Current
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions;
- Name = "Current";
- Target = STRING(PYMAJMIN);
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_Versions_ver_Headers
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver;
- Name = "Headers";
- Target = STRING(CONCAT3(include/python,PYMAJMIN,m));
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_idle
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_bin;
- Name = "idle3";
- Target = STRING(CONCAT2(idle,PYMAJMIN));
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pydoc
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_bin;
- Name = "pydoc3";
- Target = STRING(CONCAT2(pydoc,PYMAJMIN));
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_python
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_bin;
- Name = "python3";
- Target = STRING(CONCAT2(python,PYMAJMIN));
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pythonconfig
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_bin;
- Name = "python3-config";
- Target = STRING(CONCAT3(python,PYMAJMIN,-config));
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pythonw
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_bin;
- Name = "pythonw3";
- Target = STRING(CONCAT2(pythonw,PYMAJMIN));
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pyvenv
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_bin;
- Name = "pyvenv";
- Target = STRING(CONCAT2(pyvenv-,PYMAJMIN));
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_libpython
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_lib;
- Name = STRING(CONCAT3(libpython,PYMAJMIN,.dylib));
- Target = "../LibreOfficePython";
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_libpython_m
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_lib;
- Name = STRING(CONCAT3(libpython,PYMAJMIN,m.dylib));
- Target = "../LibreOfficePython";
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_pkgconfig
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig;
- Name = "python3.pc";
- Target = STRING(CONCAT3(python-,PYMAJMIN,.pc));
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_pkgconfig_m
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig;
- Name = STRING(CONCAT3(python-,PYMAJMIN,m.pc));
- Target = STRING(CONCAT3(python-,PYMAJMIN,.pc));
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_libpython_config_a
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
- Name = STRING(CONCAT3(libpython,PYMAJMIN,.a));
- Target = "../../../LibreOfficePython";
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_libpython_config_dylib
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
- Name = STRING(CONCAT3(libpython,PYMAJMIN,.dylib));
- Target = "../../../LibreOfficePython";
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_libpython_m_config_a
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
- Name = STRING(CONCAT3(libpython,PYMAJMIN,m.a));
- Target = "../../../LibreOfficePython";
- Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_libpython_m_config_dylib
- BIN_FILE_BODY;
- Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
- Name = STRING(CONCAT3(libpython,PYMAJMIN,m.dylib));
- Target = "../../../LibreOfficePython";
- Styles = ();
-End
-#endif //MACOSX
-#endif //SYSTEM_PYTHON
-
#ifdef UNX
// pyuno.so even on Mac OS X, because it is a python module
commit 6166282edeb1a5c44d34d4824eab1f82b6e7b15a
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 16 15:29:09 2013 +0300
Handle symlinks separately
Change-Id: Ie94a16baaae9d942675d06dda9444b502e6a08dd
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 69aef84..ec6313b 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -292,9 +292,14 @@ sub copy_one_file
{
my ($source, $dest) = @_;
- my ($returnvalue, $infoline);
+ my ($returnvalue, $infoline, $copyreturn);
- my $copyreturn = copy($source, $dest);
+ if ( -l $source ) {
+ $copyreturn = symlink(readlink("$source"), "$dest");
+ }
+ else {
+ $copyreturn = copy($source, $dest);
+ }
if ($copyreturn)
{
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 9a122e4..27f0010 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -373,10 +373,15 @@ sub install_simple ($$$$$$)
unlink "$destdir$destination";
}
- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
- my $sourcestat = stat($sourcepath);
- utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
- chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
+ if ( -l "$sourcepath" ) {
+ symlink (readlink ("$sourcepath"), "$destdir$destination") || die "Can't symlink $destdir$destination -> " . readlink ("$sourcepath") . "$!";
+ }
+ else {
+ copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
+ my $sourcestat = stat($sourcepath);
+ utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
+ chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
+ }
push @lines, "$destination\n";
}
commit c2aac3b42e7122569770377091be502939fc9a26
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 16 15:27:54 2013 +0300
Accept also symlinks: check for existence only
Change-Id: I89c0d24941de21f9be732fed80f499217f5c281b
diff --git a/solenv/bin/modules/installer/filelists.pm b/solenv/bin/modules/installer/filelists.pm
index cd0bae6..a893775 100644
--- a/solenv/bin/modules/installer/filelists.pm
+++ b/solenv/bin/modules/installer/filelists.pm
@@ -51,7 +51,7 @@ sub resolve_filelist_flag
{
installer::logger::print_error("file '$path' is not in '$outdir'");
}
- if (!-f $path)
+ if (!-e $path)
{
installer::logger::print_error("file '$path' does not exist");
}
More information about the Libreoffice-commits
mailing list