Menu
▾
▴
[Octave-cvsupdate] octave-forge/admin/Windows/msvc do_pkg_init.m, NONE, 1.1 octave_msys.nsi, NONE, 1.1 makeall.sh.in, 1.5, 1.6 octave.nsi, 1.5, 1.6 octaverc.win, 1.5, 1.6
|
From: Michael G. <gof...@us...> - 2007-05-27 10:06:23
|
Update of /cvsroot/octave/octave-forge/admin/Windows/msvc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1838 Modified Files: makeall.sh.in octave.nsi octaverc.win Added Files: do_pkg_init.m octave_msys.nsi Log Message: include stripped-down MSYS shell and OplotGL + package manager rebuild script at installation Index: makeall.sh.in =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/Windows/msvc/makeall.sh.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- makeall.sh.in 25 May 2007 14:54:04 -0000 1.5 +++ makeall.sh.in 27 May 2007 10:06:15 -0000 1.6 @@ -246,7 +246,7 @@ echo "SectionGroupEnd" echo "SectionGroup \"$packmodule\" GRP_forge_$packmodule" fi - if test "$packmodule" = "main"; then + if test "$packmodule" = "main" -o "$packdesc_low" = "windows" -o "$packdesc_low" = "java"; then echo "Section \"$packdesc\" SEC_$packname" else echo "Section /o \"$packdesc\" SEC_$packname" --- NEW FILE: octave_msys.nsi --- Section "MSYS - UNIX shell" SEC_MSYS SetOverwrite try SetOutPath "$INSTDIR\msys\bin" File "${MSYS_ROOT}\bin\awk" File "${MSYS_ROOT}\bin\basename.exe" File "${MSYS_ROOT}\bin\bunzip2" File "${MSYS_ROOT}\bin\bzip2.exe" File "${MSYS_ROOT}\bin\cat.exe" File "${MSYS_ROOT}\bin\chmod.exe" File "${MSYS_ROOT}\bin\cls" File "${MSYS_ROOT}\bin\clsb" File "${MSYS_ROOT}\bin\cmd" File "${MSYS_ROOT}\bin\cmp.exe" File "${MSYS_ROOT}\bin\comm.exe" File "${MSYS_ROOT}\bin\cp.exe" File "${MSYS_ROOT}\bin\cut.exe" File "${MSYS_ROOT}\bin\date.exe" File "${MSYS_ROOT}\bin\diff.exe" File "${MSYS_ROOT}\bin\diff3.exe" File "${MSYS_ROOT}\bin\dirname.exe" File "${MSYS_ROOT}\bin\echo" File "${MSYS_ROOT}\bin\egrep" File "${MSYS_ROOT}\bin\env.exe" File "${MSYS_ROOT}\bin\ex" File "${MSYS_ROOT}\bin\expr.exe" File "${MSYS_ROOT}\bin\false.exe" File "${MSYS_ROOT}\bin\fgrep" File "${MSYS_ROOT}\bin\find.exe" File "${MSYS_ROOT}\bin\fold.exe" File "${MSYS_ROOT}\bin\ftp" File "${MSYS_ROOT}\bin\gawk.exe" File "${MSYS_ROOT}\bin\grep.exe" File "${MSYS_ROOT}\bin\gunzip" File "${MSYS_ROOT}\bin\gzip.exe" File "${MSYS_ROOT}\bin\head.exe" File "${MSYS_ROOT}\bin\id.exe" File "${MSYS_ROOT}\bin\info.exe" File "${MSYS_ROOT}\bin\infokey.exe" File "${MSYS_ROOT}\bin\install-info.exe" File "${MSYS_ROOT}\bin\install.exe" File "${MSYS_ROOT}\bin\ln.exe" File "${MSYS_ROOT}\bin\lnkcnv" File "${MSYS_ROOT}\bin\ls.exe" File "${MSYS_ROOT}\bin\m4.exe" File "${MSYS_ROOT}\bin\make.exe" File "${MSYS_ROOT}\bin\md5sum.exe" File "${MSYS_ROOT}\bin\mkdir.exe" File "${MSYS_ROOT}\bin\mount.exe" File "${MSYS_ROOT}\bin\msys-1.0.dll" File "${MSYS_ROOT}\bin\msysinfo" File "${MSYS_ROOT}\bin\mv.exe" File "${MSYS_ROOT}\bin\od.exe" File "${MSYS_ROOT}\bin\patch.exe" File "${MSYS_ROOT}\bin\printf" File "${MSYS_ROOT}\bin\ps.exe" File "${MSYS_ROOT}\bin\pwd" File "${MSYS_ROOT}\bin\rm.exe" File "${MSYS_ROOT}\bin\rmdir.exe" File "${MSYS_ROOT}\bin\sed.exe" File "${MSYS_ROOT}\bin\sh.exe" File "${MSYS_ROOT}\bin\sleep.exe" File "${MSYS_ROOT}\bin\sort.exe" File "${MSYS_ROOT}\bin\split.exe" File "${MSYS_ROOT}\bin\start" File "${MSYS_ROOT}\bin\tail.exe" File "${MSYS_ROOT}\bin\tar.exe" File "${MSYS_ROOT}\bin\tee.exe" File "${MSYS_ROOT}\bin\touch.exe" File "${MSYS_ROOT}\bin\tr.exe" File "${MSYS_ROOT}\bin\true.exe" File "${MSYS_ROOT}\bin\uname.exe" File "${MSYS_ROOT}\bin\uniq.exe" File "${MSYS_ROOT}\bin\wc.exe" File "${MSYS_ROOT}\bin\which" File "${MSYS_ROOT}\bin\xargs.exe" SetOutPath "$INSTDIR\msys\doc\msys" File "${MSYS_ROOT}\doc\msys\COPYING" File "${MSYS_ROOT}\doc\msys\COPYING.LIB" File "${MSYS_ROOT}\doc\msys\CYGWIN_LICENSE" File "${MSYS_ROOT}\doc\msys\MSYS-1.0.10-changes.rtf" File "${MSYS_ROOT}\doc\msys\MSYS_MISSION" File "${MSYS_ROOT}\doc\msys\MSYS_VS_CYGWIN" File "${MSYS_ROOT}\doc\msys\MSYS_WELCOME.rtf" File "${MSYS_ROOT}\doc\msys\README.rtf" SetOutPath "$INSTDIR\msys\etc" File "${MSYS_ROOT}\etc\config.site" File "${MSYS_ROOT}\etc\fstab.sample" File "${MSYS_ROOT}\etc\profile" File "${MSYS_ROOT}\etc\termcap" SectionEnd Index: octaverc.win =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/Windows/msvc/octaverc.win,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- octaverc.win 25 May 2007 19:15:57 -0000 1.5 +++ octaverc.win 27 May 2007 10:06:15 -0000 1.6 @@ -39,6 +39,14 @@ fprintf(" - Octplot installed.\n To enable Octplot graphic engine, use `toggle_octplot'.\n"); end -clear forge_path oplot_path scite_path +# Load MSYS shell +msys_path = sprintf ("%s%smsys", octave_config_info ("prefix"), filesep); +if (exist (msys_path, "dir")) + msys_path = [msys_path, filesep, "bin", pathsep, EXEC_PATH]; + EXEC_PATH (msys_path); + fprintf(" - MSYS shell installed.\n"); +end + +clear oplot_path scite_path msys_path fprintf ("\n"); Index: octave.nsi =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/Windows/msvc/octave.nsi,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- octave.nsi 25 May 2007 19:07:59 -0000 1.5 +++ octave.nsi 27 May 2007 10:06:15 -0000 1.6 @@ -1,15 +1,17 @@ ; Script generated by the HM NIS Edit Script Wizard. ; Determine which configuration to use -#!define CONFIG_HOME +!define CONFIG_HOME #!define USE_DEBUG #!define USE_TIMING !define OCTAVE_SUFFIX "2.9.12" !define OCTAVE_VERSION "2.9.12" #!define OCTAVE_CVS_VERSION "20070225" #!define ATLAS_PM -#!define USE_OCTPLOT +!define USE_OCTPLOT !define USE_OCTAVE_FORGE +!define USE_MSYS +!define OPLOTGL_VERSION "0.1.0" !ifdef USE_DEBUG !define OCTAVE_BASE "octave-${OCTAVE_SUFFIX}-debug" @@ -31,6 +33,7 @@ !else !define OCTAVE_SRC "C:\Sources\playground\c\octave-${OCTAVE_SUFFIX}" !endif +!define MSYS_ROOT "C:\Software\MSYS" !define VCREDIST_FILE "C:\Temp\vcredist_x86.exe" !else !define OCTAVE_ROOT "D:\Software\MSYS\local\${OCTAVE_BASE}" @@ -46,6 +49,7 @@ !define OCTAVE_SRC "D:\Sources\MixDT\playground\c\octave-${OCTAVE_SUFFIX}" !endif !define VCREDIST_FILE "D:\Temp\vcredist_x86.exe" +!define MSYS_ROOT "D:\Software\MSYS" !endif ; HM NIS Edit Wizard helper defines @@ -129,9 +133,9 @@ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" !ifdef OCTAVE_CVS_VERSION -OutFile "octave_${OCTAVE_CVS_VERSION}(${OCTAVE_VERSION})_setup.exe" +OutFile "octave-${OCTAVE_CVS_VERSION}(${OCTAVE_VERSION})-setup.exe" !else -OutFile "octave_${OCTAVE_VERSION}_setup.exe" +OutFile "octave-${OCTAVE_VERSION}-setup.exe" !endif InstallDir "$PROGRAMFILES\Octave" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" @@ -216,8 +220,9 @@ !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -#Section "MSYS Environment" SEC_MSYS -#SectionEnd +!ifdef USE_MSYS +!include "octave_msys.nsi" +!endif SectionGroup /e "Linear Algebra Libraries" GRP_LINALG @@ -263,6 +268,20 @@ SectionGroup /e "Graphics" GRP_GRAPHICS +!ifdef OPLOTGL_VERSION +Section "OplotGL" SEC_OPLOTGL + SetOverwrite try + SetOutPath "$INSTDIR\share\octave\packages\oplot-gl-${OPLOTGL_VERSION}" + File /r "${OCTAVE_ROOT}\share\octave\packages\oplot-gl-${OPLOTGL_VERSION}\*" + SetOutPath "$INSTDIR\bin" + File "${OCTAVE_ROOT}\bin\jogl.jar" + File "${OCTAVE_ROOT}\bin\jogl.dll" + File "${OCTAVE_ROOT}\bin\jogl_awt.dll" + SetOutPath "$INSTDIR\license" + File "${VCLIBS_ROOT}\license\COPYING.JOGL" +SectionEnd +!endif + Section "Gnuplot" SEC_GNUPLOT SetOverwrite try SetOutPath "$INSTDIR\bin" @@ -427,21 +446,29 @@ WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_KEY}" "InstallPath" "$INSTDIR" WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_KEY}" "Version" "${OCTAVE_VERSION}" - ExecWait '"$INSTDIR\bin\octave.exe" -q --eval "pkg rebuild;"' + InitPluginsDir + File "/oname=$PLUGINSDIR\do_pkg_init.m" "${OCTAVE_FORGE}\admin\Windows\msvc\do_pkg_init.m" + ExecWait '"$INSTDIR\bin\octave.exe" -q "$PLUGINSDIR\do_pkg_init.m"' SectionEnd ; Section descriptions !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SEC_CORE} "Octave core files" !insertmacro MUI_DESCRIPTION_TEXT ${SEC_DEV} "Octave development files (include and library files)" +!ifdef USE_MSYS + !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSYS} "UNIX-like shell environment, required to use the Octave package manager" +!endif !ifdef USE_OCTAVE_FORGE !insertmacro MUI_DESCRIPTION_TEXT ${GRP_FORGE} "Additional toolboxes for Octave" !include "${OCTAVE_FORGE}\octave_forge_desc.nsi" !endif - !insertmacro MUI_DESCRIPTION_TEXT ${SEC_GNUPLOT} "Plotting component of Octave. If not selected, Gnuplot binary must in your PATH." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC_GNUPLOT} "Basic plotting component of Octave. If not selected, Gnuplot binary must in your PATH." !ifdef USE_OCTPLOT !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPLOT} "Alternative graphics/plot engine for Octave" !endif +!ifdef OPLOTGL_VERSION + !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPLOTGL} "Java/OpenGL based 2D/3D graphics backend for Octave with high compatibility with Matlab handle graphics" +!endif !insertmacro MUI_DESCRIPTION_TEXT ${SEC_TOOLS} "Additional GNU tools required (less, makeinfo, sed...). If not selected, those tools must be available in your PATH." !insertmacro MUI_DESCRIPTION_TEXT ${SEC_VC} "Microsoft C/C++ runtime libraries required by Octave. It is STRONGLY recommended to use the default setting." !insertmacro MUI_DESCRIPTION_TEXT ${SEC_SCITE} "Powerful code editor with syntax highlighting, directly accessible from the octave prompt (http://www.scintilla.org)" --- NEW FILE: do_pkg_init.m --- global_list = pkg ("global_list"); global_packages = pkg ("rebuild"); for k = 1:length (global_packages) if (strcmp (global_packages{k}.name, "oplot-gl")) global_packages = {global_packages{1:k-1}, global_packages{k+1:end}, global_packages{k}}; save (global_list, "global_packages"); break; endif endfor |