configure.in | 2 - cross_toolset/prj/build.lst | 2 - setup_native/prj/build.lst | 5 ++ setup_native/source/win32/wintools/makecab/makefile.mk | 32 +++++++++++++++++ setup_native/source/win32/wintools/msidb/makefile.mk | 32 +++++++++++++++++ setup_native/source/win32/wintools/msiinfo/makefile.mk | 32 +++++++++++++++++ setup_native/source/win32/wintools/msimsp/makefile.mk | 32 +++++++++++++++++ setup_native/source/win32/wintools/msitran/makefile.mk | 32 +++++++++++++++++ 8 files changed, 167 insertions(+), 2 deletions(-)
New commits: commit 4e7cfbfaedc747a9c7bfabf891897d36b741a765 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Mon Jul 23 14:06:02 2012 +0200 Eventually build the lanedo msi* tools soon Change-Id: Ie8174ae4b7d2c02503f40fe1263076d924f2c9e2 diff --git a/configure.in b/configure.in index 27c63c1..7a0ec39 100644 --- a/configure.in +++ b/configure.in @@ -8562,7 +8562,7 @@ AC_SUBST(WINDOWS_SDK_HOME) dnl ========================================= dnl Check for uuidgen dnl ========================================= -if test "$_os" = "WINNT"; then +if test "$_os" = "WINNT" -a "$cross_compiling" != "yes"; then if test "$WITH_MINGW" = "yes"; then AC_PATH_PROG([UUIDGEN], [uuid]) if test -z "$UUIDGEN"; then diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst index 4346a83..2883e64 100644 --- a/cross_toolset/prj/build.lst +++ b/cross_toolset/prj/build.lst @@ -1 +1 @@ -crs cross_toolset :: autodoc cross_tail_build NULL +crs cross_toolset :: autodoc setup_native cross_tail_build NULL diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index d8ebf59..fbdbb4f 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -16,3 +16,8 @@ pk setup_native\source\win32\customactions\shellextensions nmake - w sn_sh pk setup_native\source\win32\customactions\indexingfilter nmake - w sn_indexingfilter NULL pk setup_native\source\win32\customactions\languagepacks nmake - w sn_languagepacks sn_shellextensions.w sn_tools.w NULL pk setup_native\source\win32\customactions\patch nmake - w sn_patch sn_languagepacks.w sn_shellextensions.w sn_quickstarter.w sn_tools.w NULL +pk setup_native\source\win32\wintools\makecab nmake - u sn_makecab NULL +pk setup_native\source\win32\wintools\msidb nmake - u sn_msidb NULL +pk setup_native\source\win32\wintools\msiinfo nmake - u sn_msiinfo NULL +pk setup_native\source\win32\wintools\msimsp nmake - u sn_msimsp NULL +pk setup_native\source\win32\wintools\msitran nmake - u sn_msitrans NULL diff --git a/setup_native/source/win32/wintools/makecab/makefile.mk b/setup_native/source/win32/wintools/makecab/makefile.mk new file mode 100644 index 0000000..c8fee10 --- /dev/null +++ b/setup_native/source/win32/wintools/makecab/makefile.mk @@ -0,0 +1,32 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRJ=..$/..$/..$/.. +PRJNAME=setup_native +TARGET=sn_makecab + + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +.IF "$(WINEGCC)"=="" +@all: + @echo "No winegcc present, not building makecab..." +.ELSE +@all: + @echo "Not building makecab yet, stay tuned..." +.ENDIF + +# --- Targets -------------------------------------------------------------- + +.INCLUDE : target.mk + +# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/wintools/msidb/makefile.mk b/setup_native/source/win32/wintools/msidb/makefile.mk new file mode 100644 index 0000000..2bb31bc --- /dev/null +++ b/setup_native/source/win32/wintools/msidb/makefile.mk @@ -0,0 +1,32 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRJ=..$/..$/..$/.. +PRJNAME=setup_native +TARGET=sn_msidb + + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +.IF "$(WINEGCC)"=="" +@all: + @echo "No winegcc present, not building msidb..." +.ELSE +@all: + @echo "Not building msidb yet, stay tuned..." +.ENDIF + +# --- Targets -------------------------------------------------------------- + +.INCLUDE : target.mk + +# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/wintools/msiinfo/makefile.mk b/setup_native/source/win32/wintools/msiinfo/makefile.mk new file mode 100644 index 0000000..62e09b5 --- /dev/null +++ b/setup_native/source/win32/wintools/msiinfo/makefile.mk @@ -0,0 +1,32 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRJ=..$/..$/..$/.. +PRJNAME=setup_native +TARGET=sn_msiinfo + + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +.IF "$(WINEGCC)"=="" +@all: + @echo "No winegcc present, not building msiinfo..." +.ELSE +@all: + @echo "Not building msiinfo yet, stay tuned..." +.ENDIF + +# --- Targets -------------------------------------------------------------- + +.INCLUDE : target.mk + +# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/wintools/msimsp/makefile.mk b/setup_native/source/win32/wintools/msimsp/makefile.mk new file mode 100644 index 0000000..4d6663c --- /dev/null +++ b/setup_native/source/win32/wintools/msimsp/makefile.mk @@ -0,0 +1,32 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRJ=..$/..$/..$/.. +PRJNAME=setup_native +TARGET=sn_msimsp + + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +.IF "$(WINEGCC)"=="" +@all: + @echo "No winegcc present, not building msimsp..." +.ELSE +@all: + @echo "Not building msimsp yet, stay tuned..." +.ENDIF + +# --- Targets -------------------------------------------------------------- + +.INCLUDE : target.mk + +# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/wintools/msitran/makefile.mk b/setup_native/source/win32/wintools/msitran/makefile.mk new file mode 100644 index 0000000..c22c9d1 --- /dev/null +++ b/setup_native/source/win32/wintools/msitran/makefile.mk @@ -0,0 +1,32 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRJ=..$/..$/..$/.. +PRJNAME=setup_native +TARGET=sn_msitran + + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +.IF "$(WINEGCC)"=="" +@all: + @echo "No winegcc present, not building msitran..." +.ELSE +@all: + @echo "Not building msitran yet, stay tuned..." +.ENDIF + +# --- Targets -------------------------------------------------------------- + +.INCLUDE : target.mk + +# -------------------------------------------------------------------------
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits