git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 2/9] vscode: hard-code a couple defines
Date: Mon, 30 Jul 2018 08:42:48 -0700 (PDT)	[thread overview]
Message-ID: <6c8b5a4f2234e1340859cafe29bb49b846ca140d.1532965363.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2.v2.git.gitgitgadget@gmail.com>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

Sadly, we do not get all of the definitions via ALL_CFLAGS. Some defines
are passed to GCC *only* when compiling specific files, such as git.o.

Let's just hard-code them into the script for the time being.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 contrib/vscode/init.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/contrib/vscode/init.sh b/contrib/vscode/init.sh
index 3cc93243f..494a51ac5 100755
--- a/contrib/vscode/init.sh
+++ b/contrib/vscode/init.sh
@@ -115,7 +115,19 @@ include Makefile
 vscode-init:
 	@mkdir -p .vscode && \
 	incs= && defs= && \
-	for e in $(ALL_CFLAGS); do \
+	for e in $(ALL_CFLAGS) \
+			'-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
+			'-DGIT_LOCALE_PATH="$(localedir_relative_SQ)"' \
+			'-DBINDIR="$(bindir_relative_SQ)"' \
+			'-DFALLBACK_RUNTIME_PREFIX="$(prefix_SQ)"' \
+			'-DDEFAULT_GIT_TEMPLATE_DIR="$(template_dir_SQ)"' \
+			'-DETC_GITCONFIG="$(ETC_GITCONFIG_SQ)"' \
+			'-DETC_GITATTRIBUTES="$(ETC_GITATTRIBUTES_SQ)"' \
+			'-DGIT_LOCALE_PATH="$(localedir_relative_SQ)"' \
+			'-DCURL_DISABLE_TYPECHECK', \
+			'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
+			'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
+			'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'; do \
 		case "$$e" in \
 		-I.) \
 			incs="$$(printf '% 16s"$${workspaceRoot}",\n%s' \
-- 
gitgitgadget


  parent reply	other threads:[~2018-07-30 15:42 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-23 13:52 [PATCH 0/9] Add support to develop Git in Visual Studio Code Johannes Schindelin via GitGitGadget
2018-07-23 13:52 ` [PATCH 1/9] contrib: add a script to initialize VS Code configuration Johannes Schindelin via GitGitGadget
2018-07-23 16:57   ` Jonathan Nieder
2018-07-30 14:28     ` Johannes Schindelin
2018-07-23 19:48   ` Junio C Hamano
2018-07-23 21:37     ` Junio C Hamano
2018-07-30 14:42     ` Johannes Schindelin
2018-07-23 13:52 ` [PATCH 2/9] vscode: hard-code a couple defines Johannes Schindelin via GitGitGadget
2018-07-23 17:41   ` Jonathan Nieder
2018-07-30 14:46     ` Johannes Schindelin
2018-07-23 13:52 ` [PATCH 3/9] cache.h: extract enum declaration from inside a struct declaration Johannes Schindelin via GitGitGadget
2018-07-23 13:52 ` [PATCH 4/9] mingw: define WIN32 explicitly Johannes Schindelin via GitGitGadget
2018-07-23 13:52 ` [PATCH 5/9] vscode: only overwrite C/C++ settings Johannes Schindelin via GitGitGadget
2018-07-23 13:52 ` [PATCH 6/9] vscode: wrap commit messages at column 72 by default Johannes Schindelin via GitGitGadget
2018-07-23 13:52 ` [PATCH 7/9] vscode: use 8-space tabs, no trailing ws, etc for Git's source code Johannes Schindelin via GitGitGadget
2018-07-25  7:32   ` Johannes Sixt
2018-07-30 14:48     ` Johannes Schindelin
2018-07-23 13:52 ` [PATCH 8/9] vscode: add a dictionary for cSpell Johannes Schindelin via GitGitGadget
2018-07-23 13:53 ` [PATCH 9/9] vscode: let cSpell work on commit messages, too Johannes Schindelin via GitGitGadget
2018-07-30 15:42 ` [PATCH v2 0/9] Add support to develop Git in Visual Studio Code Johannes Schindelin via GitGitGadget
2018-07-30 15:42   ` [PATCH v2 1/9] contrib: add a script to initialize VS Code configuration Johannes Schindelin via GitGitGadget
2018-07-30 15:42   ` Johannes Schindelin via GitGitGadget [this message]
2018-07-30 15:42   ` [PATCH v2 3/9] cache.h: extract enum declaration from inside a struct declaration Johannes Schindelin via GitGitGadget
2018-07-30 15:42   ` [PATCH v2 4/9] mingw: define WIN32 explicitly Johannes Schindelin via GitGitGadget
2018-07-30 15:42   ` [PATCH v2 5/9] vscode: only overwrite C/C++ settings Johannes Schindelin via GitGitGadget
2018-07-30 15:42   ` [PATCH v2 6/9] vscode: wrap commit messages at column 72 by default Johannes Schindelin via GitGitGadget
2018-07-30 15:42   ` [PATCH v2 7/9] vscode: use 8-space tabs, no trailing ws, etc for Git's source code Johannes Schindelin via GitGitGadget
2018-07-30 15:42   ` [PATCH v2 8/9] vscode: add a dictionary for cSpell Johannes Schindelin via GitGitGadget
2018-07-30 15:42   ` [PATCH v2 9/9] vscode: let cSpell work on commit messages, too Johannes Schindelin via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6c8b5a4f2234e1340859cafe29bb49b846ca140d.1532965363.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).