Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-07-26 Thread Nick Treleaven
On 08/07/2012 13:04, Nick Treleaven wrote: BTW I've run into 2 problems with the install target: 1. cp -r and xcopy treat the destination path differently. Currently MSYS install is broken and will install data files as $DESTDIR/data/data/* - I've replaced xcopy with separate copy targets local

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-07-10 Thread Dimitar Zhekov
On Tue, 10 Jul 2012 12:55:58 +0100 Nick Treleaven wrote: > >> I've replaced xcopy with separate copy targets > >> locally. Unfortunately that causes errors with subdirectories so I had > >> to ignore them, which I'd prefer not to do. See attached diff. > > > > "cp: omitting directory 'foo'" error

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-07-10 Thread Nick Treleaven
On 09/07/2012 19:13, Dimitar Zhekov wrote: On Sun, 08 Jul 2012 13:04:54 +0100 Nick Treleaven wrote: BTW I've run into 2 problems with the install target: 1. cp -r and xcopy treat the destination path differently. Currently MSYS install is broken and will install data files as $DESTDIR/data/da

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-07-09 Thread Dimitar Zhekov
On Sun, 08 Jul 2012 13:04:54 +0100 Nick Treleaven wrote: > BTW I've run into 2 problems with the install target: > > 1. cp -r and xcopy treat the destination path differently. Currently > MSYS install is broken and will install data files as > $DESTDIR/data/data/* - I've replaced xcopy with se

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-07-08 Thread Nick Treleaven
On 07/07/2012 13:16, Dimitar Zhekov wrote: On Wed, 04 Jul 2012 12:59:11 +0100 Nick Treleaven wrote: On 28/06/2012 18:55, Dimitar Zhekov wrote: BTW if you think plugins$(DIRSEP)*.dll looks ugly, we can use: plugins$/*.dll Nice. :) Though what I find a bit unpleasant is using the specific s

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-07-07 Thread Dimitar Zhekov
On Wed, 04 Jul 2012 12:59:11 +0100 Nick Treleaven wrote: > On 28/06/2012 18:55, Dimitar Zhekov wrote: > > > BTW if you think plugins$(DIRSEP)*.dll looks ugly, we can use: > plugins$/*.dll Nice. :) Though what I find a bit unpleasant is using the specific separator for a single install command, n

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-07-04 Thread Nick Treleaven
On 28/06/2012 18:55, Dimitar Zhekov wrote: On Thu, 28 Jun 2012 14:41:25 +0100 Nick Treleaven wrote: Yes, using a target for plugins only would be OK. What if we put the an install: target in plugins/makefile.win32? That works, needs no DIRSEP, and is very similar to the *nix installation. To

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-28 Thread Dimitar Zhekov
On Thu, 28 Jun 2012 14:41:25 +0100 Nick Treleaven wrote: > Yes, using a target for plugins only would be OK. What if we put the an install: target in plugins/makefile.win32? That works, needs no DIRSEP, and is very similar to the *nix installation. To avoid 'C:/Program Files/Geany already exists

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-28 Thread Dimitar Zhekov
On Thu, 28 Jun 2012 16:28:50 +0200 Thomas Martitz wrote: > Am 28.06.2012 15:41, schrieb Nick Treleaven: > > > > And then perhaps use $(MAKE) CP="$(CP)" RM="$(RM)" to pass these > > variables to the sub-makefiles so they don't need to have copies of > > the ifdef. They only need CP and RM. > >

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-28 Thread Thomas Martitz
Am 28.06.2012 16:30, schrieb Nick Treleaven: On 28/06/2012 15:28, Thomas Martitz wrote: Am 28.06.2012 15:41, schrieb Nick Treleaven: -include localwin32.mk ifdef MSYS CP = cp CP_R = cp -r RM = rm DIRSEP = / endif And then perhaps use $(MAKE) CP="$(CP)" RM="$(RM)" to pass these variables to th

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-28 Thread Nick Treleaven
On 28/06/2012 15:28, Thomas Martitz wrote: Am 28.06.2012 15:41, schrieb Nick Treleaven: -include localwin32.mk ifdef MSYS CP = cp CP_R = cp -r RM = rm DIRSEP = / endif And then perhaps use $(MAKE) CP="$(CP)" RM="$(RM)" to pass these variables to the sub-makefiles so they don't need to have cop

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-28 Thread Thomas Martitz
Am 28.06.2012 15:41, schrieb Nick Treleaven: -include localwin32.mk ifdef MSYS CP = cp CP_R = cp -r RM = rm DIRSEP = / endif And then perhaps use $(MAKE) CP="$(CP)" RM="$(RM)" to pass these variables to the sub-makefiles so they don't need to have copies of the ifdef. They only need CP and RM

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-28 Thread Nick Treleaven
On 27/06/2012 21:32, Dimitar Zhekov wrote: On Tue, 26 Jun 2012 21:21:57 +0100 Nick Treleaven wrote: I've now committed to master an install target similar to your first patch, but using xcopy for data. I used a DIRSEP variable: $(CP) plugins$(DIRSEP)*.dll "$(DESTDIR)/lib" A make -C install-p

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-27 Thread Dimitar Zhekov
On Tue, 26 Jun 2012 21:21:57 +0100 Nick Treleaven wrote: > I can now apply the -b version, but I had to add 'src/' to the second > file in the diff - are you manually concatenating diffs? Yes; the 2nd file lacked 'src/', sorry. > Wouldn't it be better to use 'git diff'? My Win~1 tools are ver

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-27 Thread Nick Treleaven
On 26/06/2012 21:46, Nick Treleaven wrote: On 26/06/2012 21:31, Nick Treleaven wrote: On 26/06/2012 21:21, Nick Treleaven wrote: MSYS does treat backslashes as escapes, and I think that is a worse problem than cmd.exe interpreting forward slashes as command options, as it can occur in more situ

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-26 Thread Nick Treleaven
On 26/06/2012 21:31, Nick Treleaven wrote: On 26/06/2012 21:21, Nick Treleaven wrote: MSYS does treat backslashes as escapes, and I think that is a worse problem than cmd.exe interpreting forward slashes as command options, as it can occur in more situations. I think we should use forward slashe

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-26 Thread Nick Treleaven
On 26/06/2012 21:21, Nick Treleaven wrote: MSYS does treat backslashes as escapes, and I think that is a worse problem than cmd.exe interpreting forward slashes as command options, as it can occur in more situations. I think we should use forward slashes throughout. I expected something like th

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-26 Thread Nick Treleaven
On 26/06/2012 18:02, Colomban Wendling wrote: > Unfortunately I can't get your patch to apply against current Git, but > I'm not sure why (see attached file for errors). Can you/someone test if > it applies (maybe there's something weird happening on my Windows setup)? It applies fine here.

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-26 Thread Nick Treleaven
On 26/06/2012 20:06, Dimitar Zhekov wrote: MSYS does treat backslashes as escapes, and I think that is a worse problem than cmd.exe interpreting forward slashes as command options, as it can occur in more situations. I think we should use forward slashes throughout. I expected something like th

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-26 Thread Dimitar Zhekov
On Mon, 25 Jun 2012 13:52:12 -0700 Matthew Brush wrote: > > C> mingw32-make -f makefile.win32 > > C> mingw32-make -f makefile.win32 install > > > > Tested with mingw, cmd/tcc. Should work with MSYS make too... but I had > > to use backslashes in the install: target, and am not sure if/how MSYS >

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-26 Thread Colomban Wendling
Le 26/06/2012 19:02, Colomban Wendling a écrit : > Le 26/06/2012 18:11, Nick Treleaven a écrit : >> On 25/06/2012 20:33, Dimitar Zhekov wrote: >>> Hi. Here is a small diff (for makefile.win32 and src/makefile.win32 >>> only) that makes Geany 1.22 Win~1 compilation and installation >>> independent o

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-26 Thread Colomban Wendling
Le 26/06/2012 18:11, Nick Treleaven a écrit : > On 25/06/2012 20:33, Dimitar Zhekov wrote: >> Hi. Here is a small diff (for makefile.win32 and src/makefile.win32 >> only) that makes Geany 1.22 Win~1 compilation and installation >> independent of MSYS. Usage: >> >> C> mingw32-make -f makefile.win32

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-26 Thread Nick Treleaven
On 25/06/2012 20:33, Dimitar Zhekov wrote: Hi. Here is a small diff (for makefile.win32 and src/makefile.win32 only) that makes Geany 1.22 Win~1 compilation and installation independent of MSYS. Usage: C> mingw32-make -f makefile.win32 C> mingw32-make -f makefile.win32 install Tested with min

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-25 Thread Matthew Brush
On 12-06-25 12:33 PM, Dimitar Zhekov wrote: On Fri, 22 Jun 2012 13:08:22 -0700 Matthew Brush wrote: Hi. Here is a small diff (for makefile.win32 and src/makefile.win32 only) that makes Geany 1.22 Win~1 compilation and installation independent of MSYS. Usage: C> mingw32-make -f makefile.win32 C

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-25 Thread Dimitar Zhekov
On Fri, 22 Jun 2012 13:08:22 -0700 Matthew Brush wrote: Hi. Here is a small diff (for makefile.win32 and src/makefile.win32 only) that makes Geany 1.22 Win~1 compilation and installation independent of MSYS. Usage: C> mingw32-make -f makefile.win32 C> mingw32-make -f makefile.win32 install Test

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-22 Thread Matthew Brush
On 12-06-22 09:23 AM, Nick Treleaven wrote: On 19/06/2012 22:25, Matthew Brush wrote: On 12-06-19 10:12 AM, Dimitar Zhekov wrote: Hi, Now that 1.22 is out, how about removing the MSYS build dependency under Win~1? I tried to compile Geany with the default MinGW make, without any MSYS, and ther

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-22 Thread Dimitar Zhekov
On Fri, 22 Jun 2012 17:23:26 +0100 Nick Treleaven wrote: > >> $(MAKE) -C foo -f makefile.win32 > > OK. > > >> Linking does not work, because the stock make supports \ only for > >> variables, not commands. But that's even easier to fix: [...] > > OK. > > >> There is also some inconsistency: C

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-22 Thread Nick Treleaven
On 19/06/2012 22:25, Matthew Brush wrote: On 12-06-19 10:12 AM, Dimitar Zhekov wrote: Hi, Now that 1.22 is out, how about removing the MSYS build dependency under Win~1? I tried to compile Geany with the default MinGW make, without any MSYS, and there were some easily fixable problems: cd foo&

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-20 Thread Dimitar Zhekov
On Tue, 19 Jun 2012 14:25:11 -0700 Matthew Brush wrote: > On 12-06-19 10:12 AM, Dimitar Zhekov wrote: > > Hi, > > > > Now that 1.22 is out, how about removing the MSYS build dependency > > under Win~1? I tried to compile Geany with the default MinGW make, > > without any MSYS, and there were some

Re: [Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-19 Thread Matthew Brush
On 12-06-19 10:12 AM, Dimitar Zhekov wrote: Hi, Now that 1.22 is out, how about removing the MSYS build dependency under Win~1? I tried to compile Geany with the default MinGW make, without any MSYS, and there were some easily fixable problems: cd foo&& $(MAKE) -f makefile.win32&& cd ..\.. d

[Geany-devel] Remove MSYS dependency of Geany on Win~1

2012-06-19 Thread Dimitar Zhekov
Hi, Now that 1.22 is out, how about removing the MSYS build dependency under Win~1? I tried to compile Geany with the default MinGW make, without any MSYS, and there were some easily fixable problems: cd foo && $(MAKE) -f makefile.win32 && cd ..\.. does not work, probably requires some sh. But i