[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/src

[Damjan Jovanovic]

 solenv/src/dmake-cygwin64.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 818212990152aa9757d4f0e27adca1ad743be79d
Author: Damjan Jovanovic 
Date:   Sun Mar 4 08:39:49 2018 +

Fix a Windows build-breaking bug introduced in

my last commit, caused by the wrong conversion
direction between POSIX and Windows paths
in 1 dmake function.

Patch by: me

diff --git a/solenv/src/dmake-cygwin64.patch b/solenv/src/dmake-cygwin64.patch
index fabeb561b206..b363cb21464e 100644
--- a/solenv/src/dmake-cygwin64.patch
+++ b/solenv/src/dmake-cygwin64.patch
@@ -41,7 +41,7 @@ diff -Nur sysintf.c sysintf.c
char *tmp;
 -  int err = cygwin_conv_to_win32_path(src, buf);
 -  if (err)
-+  int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, src, buf, PATH_MAX);
++  int err = cygwin_conv_path(CCP_POSIX_TO_WIN_A, src, buf, PATH_MAX);
 +  if (err < 0)
 Fatal( "error converting \"%s\" - %s\n",
src, strerror (errno));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/src svtools/workben

[Pedro Giffuni]

 solenv/src/version.c|8 
 svtools/workben/cui/loadlib.cxx |6 --
 2 files changed, 14 deletions(-)

New commits:
commit 9feaf73b22cb8ee5ba90440c50d06179f4bce8ba
Author: Pedro Giffuni 
Date:   Sat Dec 24 02:08:28 2016 +

Avoid including some dates in executable files.

Embedding build dates and other environment specific information may
casue gratuitous difference in the resulting binaries, which makes more
difficult security verifications and binary updates.

We currently make no claims but this is the first step to generate
reproducible builds. For more information check:
https://reproducible-builds.org/

While here, since we have been so lazy about updating it, also add the svn
Revision keyword to configure.ac.

diff --git a/solenv/src/version.c b/solenv/src/version.c
index 8db2097..604d83b 100644
--- a/solenv/src/version.c
+++ b/solenv/src/version.c
@@ -28,22 +28,16 @@
 
 struct VersionInfo
 {
-const char* pTime;
-const char* pDate;
 const char* pUpd;
 const char* pMinor;
 const char* pBuild;
-const char* pInpath;
 };
 
 static const struct VersionInfo g_aVersionInfo =
 {
-__TIME__,
-__DATE__,
 _UPD,
 _LAST_MINOR,
 _BUILD,
-_INPATH
 };
 
 #if defined(WNT) || defined(OS2)
@@ -65,8 +59,6 @@ const struct VersionInfo *GetVersionInfo(void)
 int main( int argc, char **argv )
 {
 const VersionInfo *pInfo = GetVersionInfo();
-fprintf( stderr, "Date : %s\n", pInfo->pDate);
-fprintf( stderr, "Time : %s\n", pInfo->pTime);
 fprintf( stderr, "UPD : %s\n", pInfo->pUpd);
 delete pInfo;
 return 0;
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index 190fac9..fd34fc2 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.cxx
@@ -37,12 +37,9 @@ using namespace rtl;
 extern "C" {
 struct VersionInfo
 {
-const char* pTime;
-const char* pDate;
 const char* pUpd;
 const char* pMinor;
 const char* pBuild;
-const char* pInpath;
 };
 
 typedef VersionInfo*(__LOADONCALLAPI *GetVersionInfo)(void);
@@ -67,12 +64,9 @@ int __LOADONCALLAPI main( int argc, char **argv )
 }
 if ( pInfo )
 {
-fprintf( stdout, "Date : %s\n", pInfo->pDate );
-fprintf( stdout, "Time : %s\n", pInfo->pTime );
 fprintf( stdout, "UPD : %s\n", pInfo->pUpd );
 fprintf( stdout, "Minor : %s\n", pInfo->pMinor );
 fprintf( stdout, "Build : %s\n", pInfo->pBuild );
-fprintf( stdout, "Inpath : %s\n", pInfo->pInpath );
 }
 else
 fprintf( stderr, "VersionInfo not Found !\n" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits