From: Tatsuro M. <tma...@ya...> - 2017-07-31 11:10:07
|
Similar changes can be applied to 5.3 Tatsuro --- Tatsuro MATSUOKA wrote: > Thank you for the change. > I was able to build rc4 source on rc4 without treatments. > Now corresponding binary packages are uploaded. > > Tatsuro > > > > > ----- Original Message ----- > > From: sfeam > > To: gnuplot-beta > > Cc: > > Date: 2017/7/31, Mon 12:25 > > Subject: Re: Version 5.2 release candidate -rc3 > > > > OK. > > tarball for -rc4 is uploaded. > > All source files are identical to -rc3. > > The only change is to the inventory of subdirectories for Windows packages > > as discussed below. > > > > Ethan > > > > On Monday, 31 July 2017 10:44:57 Tatsuro MATSUOKA wrote: > >> ----- Original Message ----- > >> > >> > From: sfeam > >> > To: gnuplot-beta Tatsuro MATSUOKA > Cc: > >> > Date: 2017/7/31, Mon 10:10 > >> > Subject: Re: Version 5.2 release candidate -rc3 > >> > > >> > >> > That is intentional. So far as I know the scripts in the pm3d > > subdirectory are > >> > no longer needed because the operations they perform are now part of > > the main > >> > program. > >> > The scripts can still be obtained from the SourceForge site if someone > > wants > >> > them. > >> > > >> >> and make installer on windows build fails. > >> > > >> > Can you figure out why it fails? Is it because of these files > >> > > >> > .../config/mingw/Makefile > >> > .../config/msvc/Makefile > >> > > >> > Does this patch fix it? > >> > > >> > --- gnuplot52/config/mingw/Makefile 2017-07-30 09:44:01.450442197 > > -0700 > >> > +++ test52/config/mingw/Makefile 2017-07-30 18:01:58.078032167 > > -0700 > >> > @@ -1029,8 +1029,8 @@ > >> > -cp -p $(M)* $(DESTDIR)/demo/ > >> > mkdir -p $(DESTDIR)/demo/games > >> > -cp -p $(M)/games/* $(DESTDIR)/demo/games/ > >> > - mkdir -p $(DESTDIR)/contrib/pm3d/ > >> > - -cp -p $(TOP)/pm3d/contrib/* $(DESTDIR)/contrib/pm3d/ > >> > +# mkdir -p $(DESTDIR)/contrib/pm3d/ > >> > +# -cp -p $(TOP)/pm3d/contrib/* $(DESTDIR)/contrib/pm3d/ > >> > # docs > >> > mkdir -p $(DESTDIR)/docs > >> > -cp -p gnuplot.pdf $(DESTDIR)/docs/ > >> > --- gnuplot52/config/msvc/Makefile 2017-07-30 09:44:01.458441784 > > -0700 > >> > +++ test52/config/msvc/Makefile 2017-07-30 18:06:33.926299097 -0700 > >> > @@ -550,8 +550,8 @@ > >> > xcopy /Y $(TOP)\demo $(DESTDIR)\demo > >> > if not exist $(DESTDIR)\demo\games mkdir > >> > $(DESTDIR)\demo\games > >> > xcopy /Y $(TOP)\demo\games $(DESTDIR)\demo\games > >> > - if not exist $(DESTDIR)\contrib\pm3d mkdir > >> > $(DESTDIR)\contrib\pm3d > >> > - xcopy /Y $(TOP)\pm3d\contrib\*.* > >> > $(DESTDIR)\contrib\pm3d > >> > +# if not exist $(DESTDIR)\contrib\pm3d mkdir > >> > $(DESTDIR)\contrib\pm3d > >> > +# xcopy /Y $(TOP)\pm3d\contrib\*.* > >> > $(DESTDIR)\contrib\pm3d > >> > > >> > zip: > >> > $(MAKE) DESTDIR=.\gnuplot install > >> > > >> > >> For zip and 7zip archives, the above is enough. > >> For installer additional change is required > >> > >> # *************************** > >> --- a/win/gnuplot.iss 2017-07-31 10:21:32.139777700 +0900 > >> +++ b/win/gnuplot.iss 2016-08-10 01:23:27.000000000 +0900 > >> @@ -260,7 +260,7 @@ > >> > >> ; demo files / contrib > >> > >> -;Source: "contrib\*"; DestDir: {app}\contrib\; > > Flags: recursesubdirs; Components: demo > >> +Source: "contrib\*"; DestDir: {app}\contrib\; Flags: > > recursesubdirs; Components: demo > >> > >> Source: "demo\*"; DestDir: {app}\demo\; Flags: > > recursesubdirs; Components: demo > >> > >> # *************************** > >> > >> > >> > >> In the iss file (Setting file for Inno Setup Compiler), ";" is a > > comment mark. > >> I did not test on MSVC because I do not have build environments of gnuplot > > using MSVC. > >> > >> > >> > >> > > >> >> In 5.2 cvs source tree, directory pm3d exist and I copy it to the > > 5.2-rc > >> > source tree and execute make installer. > >> >> > >> >> Please correct the 5.2-rc package. > >> > > >> > If it is really needed for the program itself then I will restore the > > pm3d > >> > subdirectory. > >> > But if the problem is only that the subdirectly is incorrectly listed > > in the > >> > Makefile > >> > then let's fix that instead. > >> > > >> > thanks for testing > >> > > >> > Ethan > >> > >> I deleted contrib directory and executed all.dem. > >> all.dem worked fine without the pm3d subdirectory. > >> > >> Please fix Makefile and gnuplot.iss. > >> > >> Tatsuro > >> > >> > >> >> Tatsuro > >> > > >> > >> > > ------------------------------------------------------------------------------ > >> Check out the vibrant tech community on one of the world's most > >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot > >> _______________________________________________ > >> gnuplot-beta mailing list > >> gnu...@li... > >> Membership management via: > > https://lists.sourceforge.net/lists/listinfo/gnuplot-beta > > > > ------------------------------------------------------------------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > _______________________________________________ > gnuplot-beta mailing list > gnu...@li... > Membership management via: https://lists.sourceforge.net/lists/listinfo/gnuplot-beta > |