[QGit] Can't compile under windows (MSVC2008)

Hello,

I tried to follow README_WIN.txt:

C:\devel\qgit\qgit4>qmake qgit.pro

The Makefile (attached to this mail) seems to be correctly generated in the same directory (C:\devel\qgit\qgit4).

Then, under MSVC2008 Express, I get this error:

1>------ Début de la génération : Projet : qgit, Configuration : Debug Win32 ------ 1>Actions de projet Makefile en cours 1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08 1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs. 1> cd src\ && "C:\Program Files\Microsoft Visual Studio 9.0\VC\bin\nmake.exe" debug 1>Microsoft (R) Program Maintenance Utility Version 9.00.21022.08 1>Copyright (C) Microsoft Corporation. Tous droits rÚservÚs. 1>NMAKE : fatal error U1073: incapable d'obtenir 'src\\Makefile' 1>Stop. 1>NMAKE : fatal error U1077: 'cd'á: code retour '0x2' 1>Stop. 1>Project : error PRJ0019: Un outil a retourné un code d'erreur à partir de "Actions de projet Makefile en cours" 1>Le journal de génération a été enregistré à l'emplacement "file://c:\devel\qgit\qgit4\Debug\BuildLog.htm" 1>qgit - 3 erreur(s), 0 avertissement(s) ========== Génération : 0 a réussi, 1 a échoué, 0 mis à jour, 0 a été ignoré ==========

Idea someone?

Wouldn't it be nice to use CMake instead of qmake so that the MSVC solution is generated directly?

Abdel.

############################################################################# # Makefile for building: qgit # Generated by qmake (2.01a) (Qt 4.4.2-snapshot-20080730) on: mar. 23. sept. 13:26:35 2008 # Project: qgit.pro # Template: subdirs # Command: c:\devel\qt\4.4\bin\qmake.exe -win32 -o Makefile qgit.pro #############################################################################

first: make_default
MAKEFILE      = Makefile
QMAKE         = c:\devel\qt\4.4\bin\qmake.exe
DEL_FILE      = del
CHK_DIR_EXISTS= if not exist
MKDIR         = mkdir
COPY          = copy /y
COPY_FILE     = $(COPY)
COPY_DIR      = xcopy /s /q /y /i
INSTALL_FILE  = $(COPY_FILE)
INSTALL_PROGRAM = $(COPY_FILE)
INSTALL_DIR   = $(COPY_DIR)
DEL_FILE      = del
SYMLINK       = 
DEL_DIR       = rmdir
MOVE          = move
CHK_DIR_EXISTS= if not exist
MKDIR         = mkdir
SUBTARGETS    =  \
		sub-src

src\$(MAKEFILE): 
	@$(CHK_DIR_EXISTS) src\ $(MKDIR) src\ 
	cd src\ && $(QMAKE) src.pro -win32 -o $(MAKEFILE)
sub-src-qmake_all:  FORCE
	@$(CHK_DIR_EXISTS) src\ $(MKDIR) src\ 
	cd src\ && $(QMAKE) src.pro -win32 -o $(MAKEFILE)
sub-src: src\$(MAKEFILE) FORCE
	cd src\ && $(MAKE) -f $(MAKEFILE)
sub-src-make_default: src\$(MAKEFILE) FORCE
	cd src\ && $(MAKE) -f $(MAKEFILE) 
sub-src-make_first: src\$(MAKEFILE) FORCE
	cd src\ && $(MAKE) -f $(MAKEFILE) first
sub-src-all: src\$(MAKEFILE) FORCE
	cd src\ && $(MAKE) -f $(MAKEFILE) all
sub-src-clean: src\$(MAKEFILE) FORCE
	cd src\ && $(MAKE) -f $(MAKEFILE) clean
sub-src-distclean: src\$(MAKEFILE) FORCE
	cd src\ && $(MAKE) -f $(MAKEFILE) distclean
sub-src-install_subtargets: src\$(MAKEFILE) FORCE
	cd src\ && $(MAKE) -f $(MAKEFILE) install
sub-src-uninstall_subtargets: src\$(MAKEFILE) FORCE
	cd src\ && $(MAKE) -f $(MAKEFILE) uninstall

Makefile: qgit.pro  ..\..\qt\4.4\mkspecs\default\qmake.conf ..\..\qt\4.4\mkspecs\qconfig.pri \
		..\..\qt\4.4\mkspecs\features\qt_functions.prf \
		..\..\qt\4.4\mkspecs\features\qt_config.prf \
		..\..\qt\4.4\mkspecs\features\exclusive_builds.prf \
		..\..\qt\4.4\mkspecs\features\default_pre.prf \
		..\..\qt\4.4\mkspecs\features\win32\default_pre.prf \
		..\..\qt\4.4\mkspecs\features\debug.prf \
		..\..\qt\4.4\mkspecs\features\debug_and_release.prf \
		..\..\qt\4.4\mkspecs\features\default_post.prf \
		..\..\qt\4.4\mkspecs\features\win32\rtti.prf \
		..\..\qt\4.4\mkspecs\features\win32\exceptions.prf \
		..\..\qt\4.4\mkspecs\features\shared.prf \
		..\..\qt\4.4\mkspecs\features\win32\embed_manifest_exe.prf \
		..\..\qt\4.4\mkspecs\features\win32\embed_manifest_dll.prf \
		..\..\qt\4.4\mkspecs\features\warn_on.prf \
		..\..\qt\4.4\mkspecs\features\qt.prf \
		..\..\qt\4.4\mkspecs\features\win32\thread.prf \
		..\..\qt\4.4\mkspecs\features\moc.prf \
		..\..\qt\4.4\mkspecs\features\win32\windows.prf \
		..\..\qt\4.4\mkspecs\features\win32\stl_off.prf \
		..\..\qt\4.4\mkspecs\features\resources.prf \
		..\..\qt\4.4\mkspecs\features\uic.prf \
		..\..\qt\4.4\mkspecs\features\yacc.prf \
		..\..\qt\4.4\mkspecs\features\lex.prf
	$(QMAKE) -win32 -o Makefile qgit.pro
..\..\qt\4.4\mkspecs\qconfig.pri:
..\..\qt\4.4\mkspecs\features\qt_functions.prf:
..\..\qt\4.4\mkspecs\features\qt_config.prf:
..\..\qt\4.4\mkspecs\features\exclusive_builds.prf:
..\..\qt\4.4\mkspecs\features\default_pre.prf:
..\..\qt\4.4\mkspecs\features\win32\default_pre.prf:
..\..\qt\4.4\mkspecs\features\debug.prf:
..\..\qt\4.4\mkspecs\features\debug_and_release.prf:
..\..\qt\4.4\mkspecs\features\default_post.prf:
..\..\qt\4.4\mkspecs\features\win32\rtti.prf:
..\..\qt\4.4\mkspecs\features\win32\exceptions.prf:
..\..\qt\4.4\mkspecs\features\shared.prf:
..\..\qt\4.4\mkspecs\features\win32\embed_manifest_exe.prf:
..\..\qt\4.4\mkspecs\features\win32\embed_manifest_dll.prf:
..\..\qt\4.4\mkspecs\features\warn_on.prf:
..\..\qt\4.4\mkspecs\features\qt.prf:
..\..\qt\4.4\mkspecs\features\win32\thread.prf:
..\..\qt\4.4\mkspecs\features\moc.prf:
..\..\qt\4.4\mkspecs\features\win32\windows.prf:
..\..\qt\4.4\mkspecs\features\win32\stl_off.prf:
..\..\qt\4.4\mkspecs\features\resources.prf:
..\..\qt\4.4\mkspecs\features\uic.prf:
..\..\qt\4.4\mkspecs\features\yacc.prf:
..\..\qt\4.4\mkspecs\features\lex.prf:
qmake: qmake_all FORCE
	@$(QMAKE) -win32 -o Makefile qgit.pro

qmake_all: sub-src-qmake_all FORCE

make_default: sub-src-make_default FORCE
make_first: sub-src-make_first FORCE
all: sub-src-all FORCE
clean: sub-src-clean FORCE
distclean: sub-src-distclean FORCE
	-$(DEL_FILE) Makefile
install_subtargets: sub-src-install_subtargets FORCE
uninstall_subtargets: sub-src-uninstall_subtargets FORCE

sub-src-sub_Debug: src\\$(MAKEFILE)
	cd src\ && $(MAKE) debug
debug: sub-src-sub_Debug

sub-src-sub_Release: src\\$(MAKEFILE)
	cd src\ && $(MAKE) release
release: sub-src-sub_Release

mocclean: compiler_moc_header_clean compiler_moc_source_clean

mocables: compiler_moc_header_make_all compiler_moc_source_make_all install: install_subtargets FORCE

uninstall:  uninstall_subtargets FORCE

FORCE:

On 23/09/2008 13:31, Abdelrazak Younes wrote:

Just wanted to add that command-line compilation with nmake was successful and a bin/qgit.exe was generated that seems to work correctly with latest Git-1.6.0.2-preview20080923 for Windows.

Thanks to all developers involved.

Abdel.

Can add below function at qgit?
===Difference other version===
	1. user choose a commit, 
	2. right click 
		Check working dir
		View patch
		....
		[Diff with other commit]

	3. change icon +
	4. user choose other commit

	QGit show list of changed files. 
	click one files, call extern diff tool show difference. 

=== file view ===
	Can use different color to high light current commit change. 	
	

On Thu, Sep 25, 2008 at 7:24 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

You can _already_ do this.

 1. user choose a commit

 2. user choose other commit with CTRL + RIGHT CLICK

One of the problems of qgit is that the features are not immediately visible. This is a conscious choice to avoid cluttering the GUI.

Currently the _best_ way to have a complete idea of qgit is to read the handbook (press F1 key): it takes only 5 minutes and you can find interesting features otherwise very difficult to find by accident.

Marco

Marco:
	
	Yes, it is really work although it is not nature way.
	This way don't work at file view. 

	Ctrl +/- change font size, but how to change source code view
font size. 
	
	12. Marcor Costalba  10 #include <QProcess>
	12. Marcor Costalba  10 #include <QRegExp>

Best regards Frank Li

-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com] 
Sent: Thursday, September 25, 2008 7:52 PM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] Some suggestion

On Thu, Sep 25, 2008 at 7:24 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

You can _already_ do this.

 1. user choose a commit

 2. user choose other commit with CTRL + RIGHT CLICK

One of the problems of qgit is that the features are not immediately visible. This is a conscious choice to avoid cluttering the GUI.

Currently the _best_ way to have a complete idea of qgit is to read the handbook (press F1 key): it takes only 5 minutes and you can find interesting features otherwise very difficult to find by accident.

Marco

On Thu, Sep 25, 2008 at 4:20 PM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

Edit->Settings->Fixed width font

You can choose size, font family, bolding, etc...

File view and diff view are optimized for source code viewing so use fixed pitch fonts, not system default one that normally it is not fixed pitch.

Thank you for your support! Can I compare with other version at file view? I think highlight author at file view is not high light, can use different color?

-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com] 
Sent: Friday, September 26, 2008 12:34 AM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] Some suggestion

On Thu, Sep 25, 2008 at 4:20 PM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

Edit->Settings->Fixed width font

You can choose size, font family, bolding, etc...

File view and diff view are optimized for source code viewing so use fixed pitch fonts, not system default one that normally it is not fixed pitch.

On Fri, Sep 26, 2008 at 3:55 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

After selecting with CTRL+RIGHT CLICK as already descrived click on the file name, you'll be pointed to the part of the diff related to your file.

Another option is to choose one commit, click on a file name in the right bottom pane, then press the MAGIC WAND button, then commits will be reloaded with path limiter and you will see only commits that modify the selected file. Toggle magic wand button to restore original view.

What is the color you would like ? Possibly in RGB format.

Marco

I think orange color of "Working dir changes" in Rev List view is good. 

"MAGIC WAND" is google feature. I think the message of "Filter on <lib/blame.tcl>" at title omitted by user early.

I have some suggestions. 
	Option 1: Change "Rev List" to "Rev List Filtered", or add
filter icon before "Rev List"
	Option 2: Change "Short Log"  to "Short Log Filter On
<Lib/blame.tcl>"
	Option 3: Add bar between tab and list, show current filter
information 

-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com] 
Sent: Friday, September 26, 2008 1:16 PM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] Some suggestion

On Fri, Sep 26, 2008 at 3:55 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

After selecting with CTRL+RIGHT CLICK as already descrived click on the file name, you'll be pointed to the part of the diff related to your file.

Another option is to choose one commit, click on a file name in the right bottom pane, then press the MAGIC WAND button, then commits will be reloaded with path limiter and you will see only commits that modify the selected file. Toggle magic wand button to restore original view.

What is the color you would like ? Possibly in RGB format.

Marco

On Fri, Sep 26, 2008 at 7:43 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

This is the more correct but we don't have the space to write on what files it is filtering

This is less correct because short log has nothing to do with filtering, but here there is more space...

Too complicated and space wasteful IMO.

Marco

Option 1: 
	Telling user just filted is better than nothing. Is it possible
add tool button tip. 
	When mouse over 'Rev list [Felted]", show what filtering.

Best regards Frank Li

-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com] 
Sent: Friday, September 26, 2008 6:38 PM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] Some suggestion

On Fri, Sep 26, 2008 at 7:43 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

This is the more correct but we don't have the space to write on what files it is filtering

This is less correct because short log has nothing to do with filtering, but here there is more space...

Too complicated and space wasteful IMO.

Marco

On Fri, Sep 26, 2008 at 3:57 PM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

Ok!  I agree.

Thanks Marco

From: Frank Li <Frank.li@freescale.com>
Date: Sat, 27 Sep 2008 11:41:03 +0800
Subject: [PATCH] Modify Highlight Color at File Context View.
Author and line number can be easily found when choose special commit.

Signed-off-by: Frank Li <Frank.li@freescale.com>
---
 src/filecontent.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

On Sat, Sep 27, 2008 at 4:44 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

Patch applied.

Thanks Marco

2008/9/23 Abdelrazak Younes <younes@lyx.org>:

have you tried to setup MSVC for custom build ? and pass proper comamnd line with nmake ?

Marco

On 07/10/2008 13:14, Marco Costalba wrote:

Sorry, I don't follow you.

In the NMAKE field of the project properties, there is 'nmake /f Makefile debug', is that what you mean?

Abdel.

On 07/10/2008 13:41, Abdelrazak Younes wrote:

OK, by removing '/f Makefile' I manage to compile qgit from within Visual Studio. I also managed to launch it in debug mode by selecting the executable in ../bin/qgit.exe. When launched this way (F5), qgit opens up with the qgit repository but the user name and email are still not filled in, I'll try to debug that now.

Abdel.

On Mon, Sep 29, 2008 at 3:27 AM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

I have pushed to my local repo, I will be able to push to public repo only this week end.

Marco

On Wed, Oct 1, 2008 at 8:47 AM, Marco Costalba <mcostalba@gmail.com> wrote:

Ok. Now is pushed to public repo.

Frank, are you sure it works? for me it does not seem to make any difference.

Marco

 
Marco:
	
	It is difference between my patch and you applied patch. 

Git diff HEAD^
-	item->setForeground(b);
+		item->setForeground(fore);
+		item->setForeground(back);
 		item->setFont(f);

In my patch:

- item->setForeground(b); + item->setForeground(fore); + item->setBackground(back);

It should be setBackground(back), not setForeground(back);

Best regards Frank Li

-----Original Message-----
From: Marco Costalba [mailto:mcostalba@gmail.com] 
Sent: Saturday, October 04, 2008 2:20 PM
To: Li Frank-B20596
Cc: git@vger.kernel.org
Subject: Re: [QGit] [PATCH] Modify Highlight Color at File Context View.

On Wed, Oct 1, 2008 at 8:47 AM, Marco Costalba <mcostalba@gmail.com> wrote:

<Frank.Li@freescale.com> wrote:

Ok. Now is pushed to public repo.

Frank, are you sure it works? for me it does not seem to make any difference.

Marco

On Sat, Oct 4, 2008 at 4:32 PM, Li Frank-B20596 <Frank.Li@freescale.com> wrote:

Ahaaaa! My bad!

Sorry for this. Fix pushed.

Thanks Marco