configure.in | 2 +- setup_native/source/win32/wintools/makecab/makecab.c | 5 ++++- setup_native/source/win32/wintools/makecab/parseddf.c | 2 ++ setup_native/source/win32/wintools/makecab/parseddf.h | 2 ++ setup_native/source/win32/wintools/msidb/msidb.c | 2 ++ setup_native/source/win32/wintools/msimsp/msimsp.c | 2 ++ setup_native/source/win32/wintools/msitran/msitran.c | 2 ++ 7 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit c5e73b26ed81b8d75562f6ac0906f5b89e3c8c9d Author: Jan Holesovsky <[email protected]> Date: Wed Jul 25 12:36:50 2012 +0200 Vim modelines. Change-Id: I9392de62dc8b69033ba3dee815617ac3f0ff0bc6 diff --git a/setup_native/source/win32/wintools/makecab/parseddf.c b/setup_native/source/win32/wintools/makecab/parseddf.c index 0069ee1..cbd9914 100644 --- a/setup_native/source/win32/wintools/makecab/parseddf.c +++ b/setup_native/source/win32/wintools/makecab/parseddf.c @@ -380,3 +380,5 @@ DDFERR ParseDdf(char* ddfFile, PCCAB ccab, DDFSRCFILE ** srcListH, unsigned int return DDF_OK; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/setup_native/source/win32/wintools/makecab/parseddf.h b/setup_native/source/win32/wintools/makecab/parseddf.h index 24e681f..e355d0b 100644 --- a/setup_native/source/win32/wintools/makecab/parseddf.h +++ b/setup_native/source/win32/wintools/makecab/parseddf.h @@ -34,3 +34,5 @@ unsigned int ParseDdf(char * ddfFile, PCCAB vars, DDFSRCFILE ** srcListH, unsign #endif #endif /* __PARSEDDF_H__ */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/setup_native/source/win32/wintools/msidb/msidb.c b/setup_native/source/win32/wintools/msidb/msidb.c index bce31ef..6916423 100644 --- a/setup_native/source/win32/wintools/msidb/msidb.c +++ b/setup_native/source/win32/wintools/msidb/msidb.c @@ -552,3 +552,5 @@ int wmain(int argc, WCHAR *argv[]) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/setup_native/source/win32/wintools/msimsp/msimsp.c b/setup_native/source/win32/wintools/msimsp/msimsp.c index ebea6f0..8e2c99d 100644 --- a/setup_native/source/win32/wintools/msimsp/msimsp.c +++ b/setup_native/source/win32/wintools/msimsp/msimsp.c @@ -82,3 +82,5 @@ int main(int argc, char *argv[]) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/setup_native/source/win32/wintools/msitran/msitran.c b/setup_native/source/win32/wintools/msitran/msitran.c index 39d6628..2e2b5e8 100644 --- a/setup_native/source/win32/wintools/msitran/msitran.c +++ b/setup_native/source/win32/wintools/msitran/msitran.c @@ -118,3 +118,5 @@ int main(int argc, char *argv[]) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 647c6886da3eb236f45747925cdc1d77d7dfeb62 Author: Jan Holesovsky <[email protected]> Date: Wed Jul 25 12:36:03 2012 +0200 When called with no input files, just write usage (as the Windows tool does). Change-Id: I06ffe30b187db6db3cec38bb35af9da797ebca45 diff --git a/setup_native/source/win32/wintools/makecab/makecab.c b/setup_native/source/win32/wintools/makecab/makecab.c index 3cca945..9e7c4fe 100644 --- a/setup_native/source/win32/wintools/makecab/makecab.c +++ b/setup_native/source/win32/wintools/makecab/makecab.c @@ -329,7 +329,8 @@ int main(int argc, char *argv[]) if (ddfFile == NULL) { cabLog(CABLOG_ERR, "No DDF file specified."); - return 1; + usage(); + return 0; } cabLog(CABLOG_MSG, "=== Parsing directive file \"%s\"===", ddfFile); @@ -377,3 +378,5 @@ int main(int argc, char *argv[]) cabLog(CABLOG_MSG, "Cabinet file %s/%s created.", ddfVars.szCabPath, ddfVars.szCab); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit e59334ffbb6a3aac1591b7bec23d294f06d96b0e Author: Jan Holesovsky <[email protected]> Date: Wed Jul 25 12:03:11 2012 +0200 WINEGCC has to be present even in the build_config.mk. Change-Id: If0ca390da0f3ae2a36573cf54834685bd64042e3 diff --git a/configure.in b/configure.in index 6e1ffe5..1a0a72a 100644 --- a/configure.in +++ b/configure.in @@ -6106,8 +6106,8 @@ AC_SUBST(BUILD_EPM) dnl =================================================================== dnl We need winegcc when building MinGW build to be able to cross-build msi tools dnl =================================================================== +AC_PATH_PROG(WINEGCC, winegcc) if test "$WITH_MINGW" = "yes" -a "$PKGFORMAT" = "msi" ; then - AC_PATH_PROG(WINEGCC, winegcc) if test "$WINEGCC" = ""; then AC_MSG_ERROR([winegcc was not found, please install wine-devel, or wine-devel-32bit]) fi _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
