[Libreoffice-commits] .: desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_sweb.mk deskt
Repository.mk |1 desktop/Executable_sbase.mk |4 - desktop/Executable_scalc.mk |4 - desktop/Executable_sdraw.mk |4 - desktop/Executable_simpress.mk |4 - desktop/Executable_smath.mk |4 - desktop/Executable_sweb.mk |4 - desktop/Executable_swriter.mk |4 - desktop/Module_desktop.mk |1 desktop/StaticLibrary_appusermodelid.mk | 38 -- desktop/win32/source/applauncher/appusermodelid.cxx | 72 desktop/win32/source/applauncher/appusermodelid.hxx | 34 - desktop/win32/source/applauncher/launcher.cxx | 44 ++-- 13 files changed, 37 insertions(+), 181 deletions(-) New commits: commit 67673e9ba6788f4c85bfdaac6091148086f12941 Author: Jesús Corrius je...@softcatala.org Date: Mon Jun 4 11:26:20 2012 +0200 Move the AppUserModelID code to the launcher diff --git a/Repository.mk b/Repository.mk index fa701f7..2edad91 100644 --- a/Repository.mk +++ b/Repository.mk @@ -127,7 +127,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ directxcanvas \ winextendloaderenv \ winlauncher \ - appusermodelid \ )) else diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index d09faf4..375cba3 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -37,10 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_use_static_libraries,sbase,\ - appusermodelid \ -)) - $(eval $(call gb_Executable_add_libs,sbase,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 6b626e5..ce90099 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -37,10 +37,6 @@ $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_use_static_libraries,scalc,\ - appusermodelid \ -)) - $(eval $(call gb_Executable_add_libs,scalc,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 0b1b9f4..4642445 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -37,10 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_use_static_libraries,sdraw,\ - appusermodelid \ -)) - $(eval $(call gb_Executable_add_libs,sdraw,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 0ad5986..c302643 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -37,10 +37,6 @@ $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_use_static_libraries,simpress,\ - appusermodelid \ -)) - $(eval $(call gb_Executable_add_libs,simpress,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index cbbb5bd..4c7c4af 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -37,10 +37,6 @@ $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_use_static_libraries,smath,\ - appusermodelid \ -)) - $(eval $(call gb_Executable_add_libs,smath,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index dd88c31..870cf7d 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -37,10 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_use_static_libraries,sweb,\ - appusermodelid \ -)) - $(eval $(call gb_Executable_add_libs,sweb,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index f0b435f..acd299b 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -37,10 +37,6 @@ $(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_use_static_libraries,swriter,\ - appusermodelid \ -)) - $(eval $(call gb_Executable_add_libs,swriter,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index cdc3d99..cb067b3 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -77,7 +77,6 @@ ifeq
[Libreoffice-commits] .: desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_sweb.mk deskt
Repository.mk |1 desktop/Executable_sbase.mk |4 + desktop/Executable_scalc.mk |4 + desktop/Executable_sdraw.mk |4 + desktop/Executable_simpress.mk |4 + desktop/Executable_smath.mk |4 + desktop/Executable_sweb.mk |4 + desktop/Executable_swriter.mk |4 + desktop/Module_desktop.mk |1 desktop/StaticLibrary_appusermodelid.mk | 38 ++ desktop/win32/source/applauncher/appusermodelid.cxx | 72 desktop/win32/source/applauncher/appusermodelid.hxx | 34 + desktop/win32/source/applauncher/launcher.cxx |6 + desktop/win32/source/applauncher/launcher.hxx |3 desktop/win32/source/applauncher/sbase.cxx |2 desktop/win32/source/applauncher/scalc.cxx |2 desktop/win32/source/applauncher/sdraw.cxx |2 desktop/win32/source/applauncher/simpress.cxx |2 desktop/win32/source/applauncher/smath.cxx |2 desktop/win32/source/applauncher/sweb.cxx |2 desktop/win32/source/applauncher/swriter.cxx|2 21 files changed, 197 insertions(+) New commits: commit 776db316d271d14e653426e21e66b983ec52100a Author: Jesús Corrius je...@softcatala.org Date: Wed May 23 22:06:44 2012 +0200 set explicit Application User Models IDs in the native Windows launchers Change-Id: Ib60a2a4f0d28a53d997731eb34b118cc9b9f822d diff --git a/Repository.mk b/Repository.mk index 535b0e1..3f641d6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -121,6 +121,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ directxcanvas \ winextendloaderenv \ winlauncher \ + appusermodelid \ )) else diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 375cba3..d09faf4 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_use_static_libraries,sbase,\ + appusermodelid \ +)) + $(eval $(call gb_Executable_add_libs,sbase,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index ce90099..6b626e5 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_use_static_libraries,scalc,\ + appusermodelid \ +)) + $(eval $(call gb_Executable_add_libs,scalc,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 4642445..0b1b9f4 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_use_static_libraries,sdraw,\ + appusermodelid \ +)) + $(eval $(call gb_Executable_add_libs,sdraw,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index c302643..0ad5986 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_use_static_libraries,simpress,\ + appusermodelid \ +)) + $(eval $(call gb_Executable_add_libs,simpress,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 4c7c4af..cbbb5bd 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_use_static_libraries,smath,\ + appusermodelid \ +)) + $(eval $(call gb_Executable_add_libs,smath,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 870cf7d..dd88c31 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_use_static_libraries,sweb,\ + appusermodelid \ +)) + $(eval $(call gb_Executable_add_libs,sweb,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index acd299b..f0b435f 100644 ---
[Libreoffice-commits] .: desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_sweb.mk deskt
desktop/Executable_sbase.mk|7 +-- desktop/Executable_scalc.mk|7 +-- desktop/Executable_sdraw.mk|7 +-- desktop/Executable_simpress.mk |7 +-- desktop/Executable_smath.mk|7 +-- desktop/Executable_sweb.mk |7 +-- desktop/Executable_swriter.mk |7 +-- 7 files changed, 35 insertions(+), 14 deletions(-) New commits: commit 45504f9ba8de2a4372193910b2cb9405f1ea896a Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Mar 16 01:16:34 2012 +0100 fix windows build No idea if this is proper fix or it needs to be done otherwise. diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index f3caf5b..098f8c2 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sbase,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,sbase,\ -winlauncher \ +$(eval $(call gb_Executable_add_libs,sbase,\ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,sbase) : \ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,sbase,\ desktop/win32/source/applauncher/sbase \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 3c9990b..290e880 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,scalc,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,scalc,\ -winlauncher \ +$(eval $(call gb_Executable_add_libs,scalc,\ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,scalc) : \ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,scalc,\ desktop/win32/source/applauncher/scalc \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index dcea97d..2e57495 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sdraw,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,sdraw,\ -winlauncher \ +$(eval $(call gb_Executable_add_libs,sdraw,\ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,sdraw) : \ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,sdraw,\ desktop/win32/source/applauncher/sdraw \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index ab0cbc0..926ad57 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,simpress,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,simpress,\ -winlauncher \ +$(eval $(call gb_Executable_add_libs,simpress,\ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,simpress) : \ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,simpress,\ desktop/win32/source/applauncher/simpress \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index fe1607b..ed1b460 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,smath,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,smath,\ -winlauncher \ +$(eval $(call gb_Executable_add_libs,smath,\ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,smath) : \ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,smath,\ desktop/win32/source/applauncher/smath \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index a8810b1..858bc7a 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sweb,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,sweb,\ -winlauncher \ +$(eval $(call gb_Executable_add_libs,sweb,\ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,sweb) : \ +$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,sweb,\ desktop/win32/source/applauncher/sweb \ )) diff --git a/desktop/Executable_swriter.mk
