[Libreoffice-commits] core.git: .gitignore
.gitignore |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 8434b855434e17db99ebcd9c8c29f989677b3571 Author: Hossein AuthorDate: Wed Apr 26 11:33:38 2023 +0200 Commit: Hossein CommitDate: Fri Apr 28 21:54:20 2023 +0200 Add .cache (Qt Creator) and gdbtrace.log (gdb) Change-Id: I80ebe9270bcb895ea95d2fd679417dd4f2b22165 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151047 Tested-by: Jenkins Reviewed-by: Hossein diff --git a/.gitignore b/.gitignore index 70f3f95819d5..2655822709cd 100644 --- a/.gitignore +++ b/.gitignore @@ -151,6 +151,7 @@ LibreOffice.VC.VC.opendb *.pro.user *.pro.user.* .qtc_clangd +.cache # doxygen output /docs @@ -158,9 +159,10 @@ LibreOffice.VC.VC.opendb # make dump-deps output /lo.png -# gdb config +# gdb specific /.gdbinit /.gdb_history +gdbtrace.log # Codelite IDE specific *.project
[Libreoffice-commits] core.git: .gitignore
.gitignore |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1af3cb6cf2f635e1d5431942a787d52a2ec3fa70 Author: buldi AuthorDate: Thu Feb 9 22:30:26 2023 +0100 Commit: Ilmari Lauhakangas CommitDate: Sun Feb 12 21:37:18 2023 + .gitignore: /.vscode* Some VS Code extensions create directories with this prefix. Change-Id: Ie4a96a276970327d8da39bffd51eaf137e4163bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146728 Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/.gitignore b/.gitignore index 80da6ef39f9f..70f3f95819d5 100644 --- a/.gitignore +++ b/.gitignore @@ -141,7 +141,7 @@ DerivedData *.opensdf *.vcxproj* /.vs -/.vscode +/.vscode* *.VC.db LibreOffice.VC.VC.opendb
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit e01fc6d7c1353ed2df4d8fcc06bd3b335e89fa04 Author: Stephan Bergmann AuthorDate: Fri Jul 1 15:40:29 2022 +0200 Commit: Stephan Bergmann CommitDate: Fri Jul 1 23:12:02 2022 +0200 Add generated lo.xcent to .gitignore (recently introduced in c78b49ec132eb5126445ebee7d259d3df7fcaa68 "don't specify entitlements that are not used (sdremote w/o bluetooth)") Change-Id: Ied7db52d891e92224bc2be0ad1277f40e5d80b3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136752 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/.gitignore b/.gitignore index 3e5bfc0d3f5b..80da6ef39f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,7 @@ /bin/odfvalidator.sh /bin/officeotron.sh /hardened_runtime.xcent +/lo.xcent /vs-code.code-workspace.template /Makefile
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 168a1bda076058b11010760af966486b723ce376 Author: Ilmari Lauhakangas AuthorDate: Fri May 13 10:30:06 2022 +0300 Commit: Ilmari Lauhakangas CommitDate: Fri May 13 15:15:12 2022 +0200 Add mold linker temp files to .gitignore Change-Id: I8c3d27cae524b30be601cefb78dca9c4139b2602 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134263 Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/.gitignore b/.gitignore index 9c85f02f90c3..3e5bfc0d3f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,7 @@ eclipsesettingfile.xml .yavide_session .vscode *.code-workspace +.mold-* # things below this point are targeted for elimination
[Libreoffice-commits] core.git: .gitignore
.gitignore |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit ab9422621bc0aa26a00aa92f8bdebe91a6519792 Author: Michael Weghorn AuthorDate: Wed Mar 30 07:21:24 2022 +0200 Commit: Michael Weghorn CommitDate: Wed Mar 30 10:46:37 2022 +0200 .gitignore: Add Qt Creator's '.qtc_clangd' Qt Creator 7 switched to using Clangd as the default backend for the code model. [1] After upgrading, `.qtc_clangd/compile_command.json` started showing up. [1] https://www.qt.io/blog/qt-creator-7-released Change-Id: I3cf30f1ef2873523d76c15c39d2d24c6227f8017 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132290 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/.gitignore b/.gitignore index f5fbde5c1f67..9c85f02f90c3 100644 --- a/.gitignore +++ b/.gitignore @@ -143,11 +143,12 @@ DerivedData *.VC.db LibreOffice.VC.VC.opendb -# QtCreator specific +# Qt Creator specific *.pro *.pro.shared *.pro.user *.pro.user.* +.qtc_clangd # doxygen output /docs @@ -190,4 +191,4 @@ LibreOffice.VC.VC.opendb # Android builds /android/jniLibs/ -/android/obj/ \ No newline at end of file +/android/obj/
[Libreoffice-commits] core.git: .gitignore
.gitignore |4 1 file changed, 4 insertions(+) New commits: commit 48c32f1118431afded725b21b6bf65b89a52ecdd Author: Pranam Lashkari AuthorDate: Tue Jun 22 23:36:43 2021 +0530 Commit: Andras Timar CommitDate: Mon Feb 14 16:05:49 2022 +0100 updated gitignore for Android builds Change-Id: I7603b1de266745ba23a3d991d5e903c6fac9ab41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117674 Tested-by: Jenkins CollaboraOffice Reviewed-by: Pranam Lashkari Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122905 Tested-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129915 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/.gitignore b/.gitignore index fe93465e832e..f5fbde5c1f67 100644 --- a/.gitignore +++ b/.gitignore @@ -187,3 +187,7 @@ LibreOffice.VC.VC.opendb # lockfile config header /solenv/lockfile/autoconf.h + +# Android builds +/android/jniLibs/ +/android/obj/ \ No newline at end of file
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit f02dea373c8162bbec5a6e0e60b74ffbd107f1a9 Author: Stephan Bergmann AuthorDate: Thu Dec 23 13:24:49 2021 +0100 Commit: Stephan Bergmann CommitDate: Thu Dec 23 14:46:25 2021 +0100 Adapt .gitignore ...to 8d7e266943447a97ad09caebc263f3b2d6abdbde "provide a 'make vscode-ide-integration' target" Change-Id: I16a7ba8acc66c3765f29f2235c173fb6853c82be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127357 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/.gitignore b/.gitignore index 418108746918..fe93465e832e 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,7 @@ /bin/odfvalidator.sh /bin/officeotron.sh /hardened_runtime.xcent +/vs-code.code-workspace.template /Makefile # make id
[Libreoffice-commits] core.git: .gitignore
.gitignore |5 - 1 file changed, 5 deletions(-) New commits: commit 369c3f202ff7d72dbdda1ff38d8232d86ccfc5af Author: Stephan Bergmann AuthorDate: Tue Dec 29 11:49:43 2020 +0100 Commit: Stephan Bergmann CommitDate: Wed Dec 30 07:43:23 2020 +0100 Drop some dubious .gitignore entries ...that had been added with ea9915a550707dace8aaf8a5aab6c1c88918e8d5 "hush more kinds of file types" for unclear reason Change-Id: I3fef3df57480c0d2de384d0a60986d83b6a3e3c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108453 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/.gitignore b/.gitignore index c37494bd71ce..dea264a366fa 100644 --- a/.gitignore +++ b/.gitignore @@ -59,11 +59,6 @@ /bin/officeotron.sh /hardened_runtime.xcent /Makefile -/NEWS -/TODO -/README -/AUTHORS -/MAINTAINERS # make id /ID ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |3 +++ 1 file changed, 3 insertions(+) New commits: commit 8d56aedbbf33c33aa68bc08c372dd898bd2314b9 Author: Noel Grandin AuthorDate: Thu Aug 13 15:21:04 2020 +0200 Commit: Noel Grandin CommitDate: Fri Aug 14 08:28:58 2020 +0200 add compilerplugin-generated files to .gitignore Change-Id: I55bfe3cc00da74fdfd594175643684c3e28fe09b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100664 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/.gitignore b/.gitignore index c37494bd71ce..ef83a7be420a 100644 --- a/.gitignore +++ b/.gitignore @@ -179,3 +179,6 @@ LibreOffice.VC.VC.opendb # vim-ide-integration /compile_commands.json + +# clang-plugin generated temporary files +compilerplugins/clang/sharedvisitor/*.dwo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore Makefile.in
.gitignore |1 + Makefile.in |1 + 2 files changed, 2 insertions(+) New commits: commit da21c6756571037dd2e5956a5aa56615f8f29be7 Author: Stephan Bergmann AuthorDate: Mon May 4 17:31:12 2020 +0200 Commit: Stephan Bergmann CommitDate: Mon May 4 22:49:05 2020 +0200 Adapt to hardened_runtime.xcent ...generated since 88453fd13a653963b394b8f865ff104b5545f137 "Enable debugging of a hardened process on macOS" Change-Id: I061b3673855d6e44f0fbf805f8cda1a9ee6f2196 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93431 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/.gitignore b/.gitignore index d68dd20e1b58..c37494bd71ce 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ /bin/bffvalidator.sh /bin/odfvalidator.sh /bin/officeotron.sh +/hardened_runtime.xcent /Makefile /NEWS /TODO diff --git a/Makefile.in b/Makefile.in index 608a7db8a320..7107d7a2ec6c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -217,6 +217,7 @@ distclean : clean compilerplugins-clean $(BUILDDIR)/config_host_lang.mk.stamp \ $(BUILDDIR)/config_host/*.h \ $(BUILDDIR)/configure \ +$(BUILDDIR)/hardened_runtime.xcent \ $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ $(BUILDDIR)/sysui/desktop/macosx/Info.plist $(if $(filter WNT,$(OS)),env -i PATH="$$PATH") $(FIND) $(SRCDIR)/solenv/gdb -name \*.pyc -exec rm {} \; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 1d137f07cb7cff1f7bcf12b51ceca6f56059b7ef Author: Muhammet Kara AuthorDate: Sat Jun 8 15:21:03 2019 +0300 Commit: Muhammet Kara CommitDate: Sat Jun 8 15:36:20 2019 +0200 Add QtCreator-specific file to .gitignore Change-Id: If00a4eed997acf2eb7783915e41c61c7651232d6 Reviewed-on: https://gerrit.libreoffice.org/73698 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/.gitignore b/.gitignore index 170fca277117..d68dd20e1b58 100644 --- a/.gitignore +++ b/.gitignore @@ -147,6 +147,7 @@ LibreOffice.VC.VC.opendb # QtCreator specific *.pro *.pro.user +*.pro.user.* # doxygen output /docs ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 024dcf2d57309a80d647e16b39dfe1100f5e8aa2 Author: Stephan Bergmann Date: Tue Jan 30 11:22:54 2018 +0100 Ignore Emacs lock files Change-Id: Idd754a4ecdd76ff6f6d0e2b848ea3526fc90dc54 diff --git a/.gitignore b/.gitignore index ab3a638307b5..43d14908236c 100644 --- a/.gitignore +++ b/.gitignore @@ -80,6 +80,7 @@ *~ .*sw? \#* +.\#* *.kdev4 .kdev_include_paths .buckd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |2 ++ 1 file changed, 2 insertions(+) New commits: commit 92bab0f11e0a93005bfd13db3a0552ecaf082ecb Author: Ashod Nakashian Date: Sun Dec 17 13:22:18 2017 -0500 .gitignore vscode ide files Change-Id: I0857885e459430e7b64f2a697943cb97d2e57cbf Reviewed-on: https://gerrit.libreoffice.org/46674 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian (cherry picked from commit c6f01eb87f5e4c1c13b78fed26c70a91aa5bcbe2) Reviewed-on: https://gerrit.libreoffice.org/46676 (cherry picked from commit b3589dd6b4b4ed78b934187f21c96cbca51382f1) Reviewed-on: https://gerrit.libreoffice.org/46989 Tested-by: Jenkins diff --git a/.gitignore b/.gitignore index a42f3877a83a..ab3a638307b5 100644 --- a/.gitignore +++ b/.gitignore @@ -93,6 +93,8 @@ eclipsesettingfile.xml .cxx_tags .yavide_proj .yavide_session +.vscode +*.code-workspace # things below this point are targeted for elimination ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 0dd17633f7d7da6ee572b0923bd6fa08605c3ae7 Author: Armin Le Grand Date: Tue Aug 29 09:41:43 2017 +0200 Added VisualStudioCode/unified MSDEV VC.db Change-Id: I5b32bb43e87dd1b3aa535611cc7228be05f3d6e4 diff --git a/.gitignore b/.gitignore index e31e4801c9fd..a42f3877a83a 100644 --- a/.gitignore +++ b/.gitignore @@ -138,7 +138,8 @@ DerivedData *.opensdf *.vcxproj* /.vs -LibreOffice.VC.db +/.vscode +*.VC.db LibreOffice.VC.VC.opendb # QtCreator specific ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4493f983d511990684588fbd141ec4f6ff0b40b6 Author: Muhammet Kara Date: Fri Jun 23 14:12:43 2017 +0300 gitignore: compile_commands.json is only top-level Change-Id: I313b86d8736e948d52d57bad77550f2969c9fc67 Reviewed-on: https://gerrit.libreoffice.org/39107 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/.gitignore b/.gitignore index 3ec069d1f0c9..e31e4801c9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -173,4 +173,4 @@ LibreOffice.VC.VC.opendb *.sublime-workspace # vim-ide-integration -compile_commands.json +/compile_commands.json ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |3 +++ 1 file changed, 3 insertions(+) New commits: commit 777637a3cd46763cf79fb4f2c0a6929349a810f6 Author: Muhammet Kara Date: Thu Jun 22 16:51:15 2017 +0300 gitignore: compile_commands.json This file is generated by "make vim-ide-integration" Change-Id: I9355bc36b2a654efd6183b268662b10b224f2117 Reviewed-on: https://gerrit.libreoffice.org/39108 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/.gitignore b/.gitignore index da1b3ea881ac..3ec069d1f0c9 100644 --- a/.gitignore +++ b/.gitignore @@ -171,3 +171,6 @@ LibreOffice.VC.VC.opendb # Sublime Specific *.sublime-project *.sublime-workspace + +# vim-ide-integration +compile_commands.json ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |3 +++ 1 file changed, 3 insertions(+) New commits: commit 8d2ef851374bc5d5a9605e9c72d47a24fdbe6a06 Author: Manfred Blume Date: Wed Apr 5 16:28:05 2017 +0200 Fix .gitignore after vs2015-ide-integration update Change-Id: I2899d02e048838f02d46d87b28fd4bbecf8a277a Reviewed-on: https://gerrit.libreoffice.org/36155 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/.gitignore b/.gitignore index 259be140e43c..da1b3ea881ac 100644 --- a/.gitignore +++ b/.gitignore @@ -137,6 +137,9 @@ DerivedData *.v12* *.opensdf *.vcxproj* +/.vs +LibreOffice.VC.db +LibreOffice.VC.VC.opendb # QtCreator specific *.pro ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit f5d59796d36f739396f346702e05a0f172687939 Author: Bernhard Widl Date: Tue Apr 4 14:08:24 2017 +0200 add *.vcxproj* to .gitignore these files are generated by make vs2015-ide-integration. Change-Id: Iaae5931289bd2f27415c401b6ac253d43dc39007 Reviewed-on: https://gerrit.libreoffice.org/36073 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/.gitignore b/.gitignore index 1b954b15ff50..259be140e43c 100644 --- a/.gitignore +++ b/.gitignore @@ -136,8 +136,7 @@ DerivedData *.v11* *.v12* *.opensdf -!windows/*.sln -!windows/*.vcxproj* +*.vcxproj* # QtCreator specific *.pro ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore ios/CustomTarget_Lo_Xcconfig.mk ios/CustomTarget_TiledLibreOffice_app.mk ios/experimental ios/.gitignore ios/lo.xcconfig.in
.gitignore |2 ios/.gitignore |3 ios/CustomTarget_Lo_Xcconfig.mk | 138 ios/CustomTarget_TiledLibreOffice_app.mk | 100 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 1861 -- ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledLibreOffice-Info.plist |6 ios/lo.xcconfig.in |2 7 files changed, 1018 insertions(+), 1094 deletions(-) New commits: commit 7a8bfd1041179997269ca02ba156136cf8b622b5 Author: jan Iversen Date: Sat Feb 11 19:31:45 2017 +0100 ios, prepare for multiple targets. Moved common macros to CustomTarget_Lo_Xcconfig.mk to simplify each real target added link to workdir/ios (needed by xcodeproj) moved creation of configuration files to LO_Xcconfig, since they are identical for all ios projects central part of moving non git files to workdir completed changed relative path in project.pbxproj to be instead of Change-Id: I6be51f4d8a07ea7da08c0e5f1458fccfc3831a1e Reviewed-on: https://gerrit.libreoffice.org/34223 Tested-by: Jenkins Reviewed-by: jan iversen diff --git a/.gitignore b/.gitignore index d3be78c..1b954b1 100644 --- a/.gitignore +++ b/.gitignore @@ -127,7 +127,6 @@ xcuserdata *.xccheckout *.moved-aside DerivedData -*.xcodeproj *.xcworkspace # MSVS specific @@ -136,7 +135,6 @@ DerivedData *.sln *.v11* *.v12* -*.vcxproj* *.opensdf !windows/*.sln !windows/*.vcxproj* diff --git a/ios/.gitignore b/ios/.gitignore index 08c6a68..4c274d7 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -6,4 +6,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -/lo.xcconfig +ioswork +lo.xcconfig diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk index 8670355..75a6cb0 100644 --- a/ios/CustomTarget_Lo_Xcconfig.mk +++ b/ios/CustomTarget_Lo_Xcconfig.mk @@ -6,35 +6,135 @@ # 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/. +#- Env +IOSWORK := $(BUILDDIR)/workdir +IOSDIR := $(IOSWORK)/ios +IOSRESOURCE := $(IOSDIR)/resources +IOSGENERATED := $(IOSDIR)/generated +IOSLINK := $(SRCDIR)/ios/ioswork +LO_XCCONFIG = $(IOSGENERATED)/lo.xcconfig + + +#- Macros to be used, in each target -- +define IOSbuild + CC=; \ + $(call gb_Helper_print_on_error, \ + xcodebuild \ + -project $(SRCDIR)/ios/experimental/$(1)/$(1).xcodeproj \ + -target $(1) \ + -sdk $(XCODEBUILD_SDK) \ + -arch $(XCODE_ARCHS) \ + -configuration $(if $(ENABLE_DEBUG),Debug,Release) \ + $(2) \ + , $(IOSDIR)/$(1).log \ +) +endef + + $(eval $(call gb_CustomTarget_CustomTarget,ios/Lo_Xcconfig)) -LO_XCCONFIG = $(BUILDDIR)/ios/lo.xcconfig $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig): $(LO_XCCONFIG) .PHONY : $(LO_XCCONFIG) $(LO_XCCONFIG) : -# Edit the Xcode configuration file: -# - the list of all our (static) libs -# - compiler flags -# + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) + + # prepare work directories for all ios builds + rm -rf $(IOSRESOURCE) $(IOSLINK) 2>/dev/null; + mkdir -p $(IOSDIR) $(IOSGENERATED) $(IOSRESOURCE) $(IOSRESOURCE)/services; + ln -s $(IOSWORK) $(IOSLINK) + + # generate file with call declarations + $(SRCDIR)/solenv/bin/native-code.py \ + -g core -g writer -g calc -g draw -g edit \ + > $(IOSGENERATED)/native-code.mm + + # generate resource files used to start/run LibreOffice + # copy rdb files + cp $(INSTDIR)/program/types.rdb $(IOSRESOURCE)/udkapi.rdb + cp $(INSTDIR)/program/types/offapi.rdb $(IOSRESOURCE) + cp $(INSTDIR)/program/types/oovbaapi.rdb$(IOSRESOURCE) + cp $(INSTDIR)/program/services/services.rdb $(IOSRESOURCE)/services + cp $(INSTDIR)/program/services.rdb $(IOSRESOURCE) + + # copy .res files + # program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure, + # we could set STAR_RESOURCE_PATH instead. sigh... + mkdir -p $(IOSRESOURCE)/program/resource + cp $(INSTDIR)/program/resource/*en-US.res $(IOSRESOURCE)/program/resource + + # soffice.cfg + mkdir -p $(IOSRESOURCE)/share/config + cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRESOURCE)/share/config + + # Japanese and Chinese dict files + cp $(WORK
[Libreoffice-commits] core.git: .gitignore
.gitignore | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) New commits: commit b17b413ea2c3902a219e2e35a949e924436d34f8 Author: Jaskaran Singh Date: Mon Dec 12 01:30:09 2016 +0530 Add rules to gitignore Rule for ctags: Sublime generated(or otherwise) ctags look like sc/abc/xyz/tags. The present rule cannot look after tags which are more than 1 directory deep. Hence this change. Other rules added : Jetbrains Clion, cscope, sublime text specific Change-Id: I1dbbe4904f3d15bbf198cd372591b464efb3896a Reviewed-on: https://gerrit.libreoffice.org/31874 Tested-by: Jenkins Reviewed-by: Jaskaran singh diff --git a/.gitignore b/.gitignore index 1e505d6..d3be78c 100644 --- a/.gitignore +++ b/.gitignore @@ -70,7 +70,8 @@ # make tags -/tags +**/tags +**/.tags* # make etags /TAGS @@ -159,4 +160,14 @@ DerivedData /.codelite *.workspace *.workspace.session -*.tags \ No newline at end of file +*.tags + +# JetBrains Clion Specific +.idea + +# Cscope +*.out + +# Sublime Specific +*.sublime-project +*.sublime-workspace ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |4 1 file changed, 4 insertions(+) New commits: commit dec8da2a9aadbb6758ee76c30582bd8620a10ecb Author: Ashod Nakashian Date: Thu Jul 7 19:23:17 2016 -0400 Ignore temporary editor/tool files Change-Id: Ibe47493edad6a6b016810ea777907d84d0f618f9 Reviewed-on: https://gerrit.libreoffice.org/28651 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/.gitignore b/.gitignore index aac380d..4d92213 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,10 @@ .settings .eclipsesettingfile eclipsesettingfile.xml +.clang_complete +.cxx_tags +.yavide_proj +.yavide_session # things below this point are targeted for elimination ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |3 +++ 1 file changed, 3 insertions(+) New commits: commit 656f639dc3664437a491fa8dd5ecf44fd430fa27 Author: Thorsten Behrens Date: Sat Apr 9 16:34:14 2016 +0200 Ignore lo.png output from make dump-deps-png Change-Id: I9d968a14db440a54e3accefb12e2d0a5685d0b37 diff --git a/.gitignore b/.gitignore index 2370081..01e57e1 100644 --- a/.gitignore +++ b/.gitignore @@ -140,6 +140,9 @@ DerivedData # doxygen output /docs +# make dump-deps output +/lo.png + # gdb config /.gdbinit /.gdb_history ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |2 ++ 1 file changed, 2 insertions(+) New commits: commit 20a4b3a081494535e5cb44832cdc9824532dc76c Author: Peter Foley Date: Sun Jan 17 14:27:44 2016 -0500 Properly ignore in-tree sdk and ndk Change-Id: If8aa9647def6741ba01bd47c02d386c43abaf452 Reviewed-on: https://gerrit.libreoffice.org/21548 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/.gitignore b/.gitignore index 9a56535..2370081 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ # default location for external downloads /external/tarballs +/external/android-ndk +/external/android-sdk-linux # autoconf generated stuff /aclocal.m4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |4 1 file changed, 4 deletions(-) New commits: commit 89f8bc6340bc15360ce27acf1a6365c2c568110f Author: Maxim Monastirsky Date: Sun Nov 29 18:20:41 2015 +0200 .gitignore: remove duplicates Change-Id: I3d735a7d16dd6aedc82f1ff162d3ba9e1040d787 diff --git a/.gitignore b/.gitignore index 6bab9f9..30f0bec 100644 --- a/.gitignore +++ b/.gitignore @@ -139,7 +139,3 @@ DerivedData # gdb config /.gdbinit /.gdb_history - -# eclipse -.project -.cproject ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |4 1 file changed, 4 insertions(+) New commits: commit 6474336e36447b1797bdf429a5f2ad5016a34262 Author: Ashod Nakashian Date: Sun Nov 15 13:52:28 2015 -0500 Ignore Visual Studio project files With `make vs2013-ide-integration` dozens of VS specific project and solution files are generated. These add noise and time to `git status` and make it harder to locate new files. Restored the exclusion of .vcxproj and .sln files and added windows/ directory to the ignore list. Change-Id: I64abe395824503a5eda25d70d7467ba3fa4e4aa8 Reviewed-on: https://gerrit.libreoffice.org/19972 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/.gitignore b/.gitignore index 90f21f4..7999ec4 100644 --- a/.gitignore +++ b/.gitignore @@ -116,9 +116,13 @@ DerivedData # MSVS specific */Debug *.sdf +*.sln *.v11* *.v12* +*.vcxproj* *.opensdf +!windows/*.sln +!windows/*.vcxproj* # QtCreator specific *.pro ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore windows/soffice.sln windows/soffice.vcxproj
.gitignore |2 - windows/soffice.sln | 18 ++ windows/soffice.vcxproj | 84 3 files changed, 102 insertions(+), 2 deletions(-) New commits: commit 43f38e717bcafb899d9ab1cfc9c277a6bfb87bee Author: Tor Lillqvist Date: Thu Nov 12 18:41:47 2015 +0200 Add a trivial Visual Studio solution with a single project to run soffice.bin The intent is not that this will grow to anything that one could build LibreOffice in. Some source files that one often needs to set breakpoints in might be added. This is in no way related to the "make vs2013-ide-integration" thing. Change-Id: I9cb3007af1dd9bff653584ad3f82f917649ce8c0 diff --git a/.gitignore b/.gitignore index 8a27343..90f21f4 100644 --- a/.gitignore +++ b/.gitignore @@ -116,10 +116,8 @@ DerivedData # MSVS specific */Debug *.sdf -*.sln *.v11* *.v12* -*.vcxproj* *.opensdf # QtCreator specific diff --git a/windows/soffice.sln b/windows/soffice.sln new file mode 100644 index 000..18993c8 --- /dev/null +++ b/windows/soffice.sln @@ -0,0 +1,18 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soffice", "soffice.vcxproj", "{4A0AC252-760E-4C2B-A408-C79CBA182370}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4A0AC252-760E-4C2B-A408-C79CBA182370}.Debug|Win32.ActiveCfg = Debug|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/windows/soffice.vcxproj b/windows/soffice.vcxproj new file mode 100644 index 000..f868d55 --- /dev/null +++ b/windows/soffice.vcxproj @@ -0,0 +1,84 @@ + +http://schemas.microsoft.com/developer/msbuild/2003";> + + + Debug + Win32 + + + Release + Win32 + + + +{4A0AC252-760E-4C2B-A408-C79CBA182370} +Win32Proj +soffice + + + +Application +true +v120 +Unicode + + +Application +false +v120 +true +Unicode + + + + + + + + + + + + +true +..\instdir\program + +.bin + + +false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |4 1 file changed, 4 insertions(+) New commits: commit 71ace488448b64e6c4cd9065e109d2c9850b031a Author: Michel Renon Date: Sat Aug 1 21:56:55 2015 +0200 QtCreator integration : git must ignore .pro and .pro.user files. Change-Id: Ifd21679fb7dd2b5c0c3bfe7726bf2c4d19897e21 Reviewed-on: https://gerrit.libreoffice.org/17467 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/.gitignore b/.gitignore index 6f7b854..ec3a2fe 100644 --- a/.gitignore +++ b/.gitignore @@ -123,6 +123,10 @@ DerivedData *.vcxproj* *.opensdf +# QtCreator specific +*.pro +*.pro.user + # doxygen output /docs ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d67f4ed258c2103e07c7a2bd94d16b604a20a8aa Author: Zsolt Bölöny Date: Thu Jun 4 10:34:45 2015 +0200 Fix typo in .gitignore Change-Id: Ibecee87ffe3ec6990e36952488668b790a8e54eb Reviewed-on: https://gerrit.libreoffice.org/16076 Tested-by: Jenkins Reviewed-by: Joren De Cuyper diff --git a/.gitignore b/.gitignore index e198d7f..6f7b854 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ # As a rule of thumb: # File that are generated by configure or the build # but that are not deleted by make clean -# can be listed here... These must be deleted by maek distclean +# can be listed here... These must be deleted by make distclean # # Files that are generated by the build but deleted by make clean # should all be under workdir or instdir ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |3 +++ 1 file changed, 3 insertions(+) New commits: commit d677e27cfa700971cba3dafa7b476a266227a547 Author: Thorsten Behrens Date: Wed Apr 1 10:23:05 2015 +0200 Also ignore idutils DB file. Change-Id: I8e50e66b0834547d10748594eac2be0b5e65e163 diff --git a/.gitignore b/.gitignore index ae1d141..aa21b13 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,9 @@ /AUTHORS /MAINTAINERS +# make id +/ID + # make tags /tags ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 99abe3b7cc055078fef1c0486d0a5165981ee7bc Author: Adolfo Jayme Barrientos Date: Sun Mar 22 14:06:07 2015 -0600 .gitignore: Spelling. Change-Id: I6d54f0aa3978996427551b429f88a74e81b90037 diff --git a/.gitignore b/.gitignore index b1e7a5b..80968e3 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,7 @@ # make etags /TAGS -# backup and temporary editor files: the only convinience rules allowed here. +# backup and temporary editor files: the only convenience rules allowed here. *~ .*sw? \#* ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 42bb1308fffbd26719618f4cbc986ace9bf0dd33 Author: Vort Date: Wed Jan 21 14:06:48 2015 +0200 Also ignore Visual Studio 2013 files Change-Id: I21bba16d70f9f8c43b60b2bd2a5005a888d0c11d Reviewed-on: https://gerrit.libreoffice.org/14073 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/.gitignore b/.gitignore index 5e45b7a..b1e7a5b 100644 --- a/.gitignore +++ b/.gitignore @@ -99,6 +99,7 @@ xcuserdata *.sdf *.sln *.v11* +*.v12* *.vcxproj* *.opensdf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore Makefile.in solenv/bin
.gitignore |3 +++ Makefile.in|5 - solenv/bin/create-tags |9 +++-- 3 files changed, 14 insertions(+), 3 deletions(-) New commits: commit 775d99c87bed9bd7d9dc10e1110990bd2c5d905e Author: Takeshi Abe Date: Fri Nov 7 21:14:50 2014 +0900 add 'make etags' to generate etags Change-Id: Id87f71b6d31720173f0c5ec2a4fc395065223b79 Reviewed-on: https://gerrit.libreoffice.org/12300 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/.gitignore b/.gitignore index 1e29927..5e45b7a 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,9 @@ /tags +# make etags +/TAGS + # backup and temporary editor files: the only convinience rules allowed here. *~ .*sw? diff --git a/Makefile.in b/Makefile.in index a051625..0a8c286 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,7 +9,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck -.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) +.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) MAKECMDGOALS?=all build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\ @@ -321,6 +321,9 @@ id: tags: @create-tags +etags: + @create-tags -e + docs: @mkdocs.sh $(SRCDIR)/docs $(SRCDIR)/solenv/inc/doxygen.cfg diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index 1d3f2a5..2ca41cd 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -7,14 +7,19 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +ctags=ctags +if test "$1" = "-e"; then +ctags=etags +fi + omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q" -ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \ +$ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \ --languages=-HTML,Java,JavaScript \ -R --exclude=instdir --exclude=workdir \ --exclude=clone --totals=yes ${SRCDIR:-*} -ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \ +$ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \ --languages=-HTML,Java,JavaScript \ -R --append=yes --totals=yes \ workdir/UnoApiHeadersTarget/udkapi/normal \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore Makefile.in
.gitignore |1 + Makefile.in |1 + 2 files changed, 2 insertions(+) New commits: commit bd633f4c85dbb7750f10083f9240282059aaf491 Author: Stephan Bergmann Date: Tue Oct 7 11:55:57 2014 +0200 Proper AC_CONFIG_FILE treatment Change-Id: Ic029d0d174a00af783fd276852231523aae59866 diff --git a/.gitignore b/.gitignore index f5df364..1e29927 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ # autoconf generated stuff /aclocal.m4 +/android/experimental/LOAndroid3/AndroidManifest.xml /autom4te.cache /autogen.input /autogen.lastrun diff --git a/Makefile.in b/Makefile.in index a06b3b3..75a2f56 100644 --- a/Makefile.in +++ b/Makefile.in @@ -157,6 +157,7 @@ distclean : clean compilerplugins-clean rm -fr \ $(BUILDDIR)/Makefile \ $(BUILDDIR)/aclocal.m4 \ +$(BUILDDIR)/android/experimental/LOAndroid3/AndroidManifest.xml \ $(BUILDDIR)/autom4te.cache \ $(BUILDDIR)/config.log \ $(BUILDDIR)/config.Build.log \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 - 1 file changed, 1 deletion(-) New commits: commit 68c99344ffaab2a3870b933082596e7858bfe122 Author: Tor Lillqvist Date: Wed Sep 17 17:47:53 2014 +0300 Had /ure/source/unorc twice in here Change-Id: Ia54dd005d7d3fb71eac646e1e24bc7c6b43410f5 diff --git a/.gitignore b/.gitignore index b7ebd03..f5df364 100644 --- a/.gitignore +++ b/.gitignore @@ -80,7 +80,6 @@ /solenv/gdb/libreoffice/util/*.pyo /moz/zipped/*.zip __pycache__ -/ure/source/unorc # OSX specific .DS_Store ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 90e3e9c3c8154be276beffed6adcb18c383cfb53 Author: Jan-Marek Glogowski Date: Mon Jun 9 17:31:49 2014 +0200 .gitignore /.gdb_history Change-Id: I254c0104010cc1a1c12bbf1af048966de66924e6 Reviewed-on: https://gerrit.libreoffice.org/10973 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/.gitignore b/.gitignore index 2a53bbc..a273e0b 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ xcuserdata # gdb config /.gdbinit +/.gdb_history ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |8 1 file changed, 8 insertions(+) New commits: commit 5a6b71547ff8312960087e031fe2b25d20d64c2a Author: Jan-Marek Glogowski Date: Thu Feb 27 20:31:00 2014 + Git: ignore autogen, doxygen and gdb config files Adds some additional files to .gitignore. Change-Id: Ia5af298a91919fe00392282c0e5bb88fa2811a52 Reviewed-on: https://gerrit.libreoffice.org/8437 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/.gitignore b/.gitignore index 3d9bc63..93031b4 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,8 @@ /aclocal.m4 /autom4te.cache /autogen.input +/autogen.lastrun +/autogen.lastrun.bak /ChangeLog /config.Build.log /config.guess @@ -95,3 +97,9 @@ xcuserdata *.v11* *.vcxproj* *.opensdf + +# doxygen output +/docs + +# gdb config +/.gdbinit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |8 1 file changed, 8 insertions(+) New commits: commit 2604726a02cc46376e19b5bd5da09bb5d1eab760 Author: Anderson Roberto Date: Tue Jan 21 20:25:38 2014 -0200 Add file extensions from MSVS to gitignore file Change-Id: Icb976111a3442eff2cd3ba0b015eef7067fe7006 Reviewed-on: https://gerrit.libreoffice.org/7582 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/.gitignore b/.gitignore index 8adc533..3d9bc63 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,11 @@ build project.xcworkspace xcuserdata *.xuserstate + +# MSVS specific +*/Debug +*.sdf +*.sln +*.v11* +*.vcxproj* +*.opensdf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 0edcb5438621b967132916052e89acb9da0f9798 Author: Michael Stahl Date: Mon Jan 6 13:17:10 2014 +0100 .gitignore: add test-install/ Change-Id: I41c617e27f34f730a3905fca67d841bdf237b5fe diff --git a/.gitignore b/.gitignore index 64ebb3c..8adc533 100644 --- a/.gitignore +++ b/.gitignore @@ -19,13 +19,14 @@ # should not catch anything but possibly /external/tarballs # -# where stuff are built +# where stuff is built /instdir /instdir_for_build /workdir /workdir_for_build +/test-install -# where the external downloads maybe located +# default location for external downloads /external/tarballs # autoconf generated stuff ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore ios/experimental ios/iosremote
.gitignore |7 +++ ios/experimental/LibreOffice/.gitignore |4 ios/iosremote/.gitignore|1 - 3 files changed, 7 insertions(+), 5 deletions(-) New commits: commit c073bc096267fe5c39139d53696a946937a586df Author: Siqi LIU Date: Sat Aug 31 12:21:44 2013 +0200 move XCode specific gitignore to top level so that all XCode projects are clean diff --git a/.gitignore b/.gitignore index f13d6e1..d4526a9 100644 --- a/.gitignore +++ b/.gitignore @@ -77,4 +77,11 @@ /moz/zipped/*.zip __pycache__ +# OSX specific .DS_Store + +# Xcode specific +build +project.xcworkspace +xcuserdata +*.xuserstate diff --git a/ios/experimental/LibreOffice/.gitignore b/ios/experimental/LibreOffice/.gitignore deleted file mode 100644 index 8c1326f..000 --- a/ios/experimental/LibreOffice/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.DS_Store -build -project.xcworkspace -xcuserdata diff --git a/ios/iosremote/.gitignore b/ios/iosremote/.gitignore deleted file mode 100644 index fa09e0d..000 --- a/ios/iosremote/.gitignore +++ /dev/null @@ -1 +0,0 @@ -UserInterfaceState.xcuserstate ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore ios/.DS_Store ios/iosremote
.gitignore |2 -- dev/null |binary 2 files changed, 2 deletions(-) New commits: commit 7cc4ee76256897cd2f401173a1546737556a3c96 Author: Siqi LIU Date: Sat Aug 31 12:13:59 2013 +0200 remove all DS_Store 'that have crept in' diff --git a/.gitignore b/.gitignore index db3d622..f13d6e1 100644 --- a/.gitignore +++ b/.gitignore @@ -77,6 +77,4 @@ /moz/zipped/*.zip __pycache__ -# iOS remote control specific -UserInterfaceState.xcuserstate .DS_Store diff --git a/ios/.DS_Store b/ios/.DS_Store deleted file mode 100644 index 121d1d8..000 Binary files a/ios/.DS_Store and /dev/null differ diff --git a/ios/iosremote/TestFlightSDK1.2.6/.DS_Store b/ios/iosremote/TestFlightSDK1.2.6/.DS_Store deleted file mode 100644 index 177ff60..000 Binary files a/ios/iosremote/TestFlightSDK1.2.6/.DS_Store and /dev/null differ diff --git a/ios/iosremote/iosremote/.DS_Store b/ios/iosremote/iosremote/.DS_Store deleted file mode 100644 index b7fa8dd..000 Binary files a/ios/iosremote/iosremote/.DS_Store and /dev/null differ diff --git a/ios/iosremote/iosremote/SWRevealViewController/.DS_Store b/ios/iosremote/iosremote/SWRevealViewController/.DS_Store deleted file mode 100644 index dbfa06c..000 Binary files a/ios/iosremote/iosremote/SWRevealViewController/.DS_Store and /dev/null differ diff --git a/ios/iosremote/iosremote/en.lproj/.DS_Store b/ios/iosremote/iosremote/en.lproj/.DS_Store deleted file mode 100644 index 28fd33c..000 Binary files a/ios/iosremote/iosremote/en.lproj/.DS_Store and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 5512bdd0e734e6fe2ad1420e78b9837a5eaf7dde Author: Siqi LIU Date: Sat Aug 31 12:08:07 2013 +0200 add DS_Store to gitignore diff --git a/.gitignore b/.gitignore index e4a4b35..db3d622 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ __pycache__ # iOS remote control specific UserInterfaceState.xcuserstate +.DS_Store ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore ios/iosremote
.gitignore |2 +- dev/null |binary 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit bf825affb3f3ee769ccf044b2b847ad48f790b94 Author: Siqi LIU Date: Wed Aug 7 12:57:18 2013 +0800 remove userstate from the repo Change-Id: I60c7d5c74f919bc165e1c2629f7b05aad2442eb7 diff --git a/.gitignore b/.gitignore index 10bb787..57caeba 100644 --- a/.gitignore +++ b/.gitignore @@ -77,4 +77,4 @@ /moz/zipped/*.zip __pycache__ -ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate +ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 4224f6d..000 Binary files a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore solenv/gbuild sw/Module_sw.mk sw/PythonTest_sw_unoapi.mk sw/qa unotest/source
.gitignore |1 solenv/gbuild/PythonTest.mk | 83 solenv/gbuild/TargetLocations.mk |2 solenv/gbuild/gbuild.mk |1 sw/Module_sw.mk |9 sw/PythonTest_sw_unoapi.mk | 17 + sw/qa/unoapi/python/get_expression.py| 53 + sw/qa/unoapi/python/set_expression.py| 40 unotest/source/python/org/libreoffice/unotest.py | 215 +++ 9 files changed, 421 insertions(+) New commits: commit 0e68bac85293e2d60fa6db3e46de8b74ab5d502b Author: David Ostrovsky Date: Sat Mar 30 22:10:48 2013 +0100 set up python unit test infrastructure Extract boostraping code from convwatch.py to unotest.py. Use python builtin unittest module as unit test framework. Specify the unit test modules in make file. Another option would be to use discover mode of unittest module. Add __pycache__ to global .gitignore to keep the source directory clean. Another option would be to deliver the unit tests to workdir prior to test execution. Currently only system python3 is supported. Change-Id: I2692817673f786e950e1176a17c7675f989755b6 Reviewed-on: https://gerrit.libreoffice.org/3214 Reviewed-by: David Ostrovsky Tested-by: David Ostrovsky diff --git a/.gitignore b/.gitignore index 8e1dea9..e666c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -75,5 +75,6 @@ /solenv/gdb/libreoffice/*.pyo /solenv/gdb/libreoffice/util/*.pyo /moz/zipped/*.zip +__pycache__ diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk new file mode 100644 index 000..d97b2a8 --- /dev/null +++ b/solenv/gbuild/PythonTest.mk @@ -0,0 +1,83 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +# PythonTest class + +# TODO: FixMe problem with internal python: +# Fatal Python error: Py_Initialize: Unable to get the locale encoding +#gb_Python_EXE := $(call gb_Executable_get_command,python) +gb_Python_EXE := python3 + +gb_PythonTest_COMMAND := $(gb_Python_EXE) -m unittest + +.PHONY : $(call gb_PythonTest_get_clean_target,%) +$(call gb_PythonTest_get_clean_target,%) : + $(call gb_Helper_abbreviate_dirs,\ + rm -f $@ $@.log) + +ifneq ($(DISABLE_PYTHON),TRUE) + +.PHONY : $(call gb_PythonTest_get_target,%) +$(call gb_PythonTest_get_target,%) : + $(call gb_Output_announce,$*,$(true),PYT,2) + $(call gb_Helper_abbreviate_dirs,\ +mkdir -p $(dir $(call gb_PythonTest_get_target,$*)) && \ + (PYTHONPATH=$(SRCDIR)/unotest/source/python:$(DEVINSTALLDIR)/opt/program \ + SOFFICE_BIN=$(DEVINSTALLDIR)/opt/program/soffice \ + URE_BOOTSTRAP=file://$(DEVINSTALLDIR)/opt/program/fundamentalrc \ + $(gb_PythonTest_COMMAND) \ +$(CLASSES) > $@.log 2>&1 || \ + (cat $@.log \ + && false))) + $(CLEAN_CMD) + +define gb_PythonTest_PythonTest +$(call gb_PythonTest_get_target,$(1)) : T_CP := +$(call gb_PythonTest_get_target,$(1)) : CLASSES := + +$(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1 +$(call gb_Helper_make_userfriendly_targets,$(1),PythonTest) + +endef + +define gb_PythonTest_add_classes +$(call gb_PythonTest_get_target,$(1)) : CLASSES += $(2) + +endef + +define gb_PythonTest_add_class +$(call gb_PythonTest_add_classes,$(1),$(2)) + +endef + +define gb_PythonTest_use_customtarget +$(call gb_PythonTest_get_target,$(1)) : $(call gb_CustomTarget_get_workdir,$(2)) + +endef + + +else # DISABLE_PYTHON + +.PHONY : $(call gb_PythonTest_get_target,$(1)) +$(call gb_PythonTest_get_target,%) : + $(call gb_Output_announce,$* (skipped - no PythonTest),$(true),PYT,2) + @true + +define gb_PythonTest_PythonTest +$(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1 +$(call gb_Helper_make_userfriendly_targets,$(1),PythonTest) + +endef + +gb_PythonTest_add_classes := +gb_PythonTest_add_class := +gb_JunitTest_use_customtarget := + +endif # DISABLE_PYTHON +# vim: set noet sw=4: diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 7f50cf6..3ea8951 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -148,6 +148,7 @@ gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done gb_JunitTest_get_classsetname = JunitTest/$(1) gb_JunitTest_get_target = $(WORKDIR)/JunitTest/$(1)/done gb_JunitTest_get_userdir = $(WORKDIR)/JunitTest/$(1)/user +gb_PythonTest_get_target = $(WORKDIR)/Pyt
[Libreoffice-commits] core.git: .gitignore
.gitignore |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 69072caa91580944f47a3d243084f63350801734 Author: Stephan Bergmann Date: Wed Apr 3 19:19:15 2013 +0200 autogen.lastrun -> autogen.input Change-Id: If205ae9eb25882a107fd1cadfab9ec3516d520db diff --git a/.gitignore b/.gitignore index fc3ecb5..8a45289 100644 --- a/.gitignore +++ b/.gitignore @@ -35,8 +35,7 @@ # autoconf generated stuff /aclocal.m4 /autom4te.cache -/autogen.lastrun -/autogen.lastrun.bak +/autogen.input /ChangeLog /config.Build.log /config.guess ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore | 27 --- 1 file changed, 27 deletions(-) New commits: commit a595c6e12b3e62179ec849328eb19115ab86e624 Author: Stephan Bergmann Date: Thu Feb 28 08:24:44 2013 +0100 dmake is dead and burried Change-Id: I5662db1cfe3506b3a8d248f872345cca4343 diff --git a/.gitignore b/.gitignore index 40739fc..a360be6 100644 --- a/.gitignore +++ b/.gitignore @@ -64,33 +64,6 @@ # things below this point are targeted for elimination -# the build directories: to be removed when dmake is dead and burried -/*/unxlng?? -/*/unxlng??.pro -/*/unxlng??? -/*/unxlng???.pro -/*/wntmsc??? -/*/wntmsc???.pro -/*/wntgcc? -/*/wntgcc?.pro -/*/unxmac?? -/*/unxmac??.pro -/*/unx?bsd?? -/*/unx?bsd??.pro -/*/unxdfly?? -/*/unxdfly??.pro -/*/unxso??? -/*/unxso???.pro -/*/unxaig?? -/*/unxaig??.pro -/*/unxios? -/*/unxios?.pro -/*/unxand? -/*/unxand?.pro -/*/unx*.obsolete -/*/wnt*.obsolete -/*/callcatcher - #stuff that we should no generated where they are /desktop/scripts/soffice.sh /intltool-extract.in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 357b2be9b77b8b04659907b434f26b5af0d94106 Author: Stephan Bergmann Date: Mon Feb 4 09:57:19 2013 +0100 ...and add new lo.xcent to .gitignore Change-Id: Ic4d098694b1dc6149aa690fa2bb106a8162ca6ab diff --git a/.gitignore b/.gitignore index aa5a6fa..40739fc 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,7 @@ /config_build/config_*.h /config_build.mk /configure +/lo.xcent /Makefile /NEWS /TODO ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits