Changeset 5224:530aec842455 in orange


Ignore:
Timestamp:
09/12/08 15:34:15 (6 years ago)
Author:
janezd <janez.demsar@…>
Branch:
default
Convert:
db63278ecf9f7b1d2b317ad6b2aef699a0d3346e
Message:
  • this version now seems to work OK. It can be used to compile versions from various branches (1.0, snapshot), with a few hard-coded exceptions here and there.
Location:
install-scripts
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • install-scripts/checkSyntax.btm

    r5223 r5224  
    22alias check=\python%1\python -c "import py_compile; py_compile.compile('%%@REPLACE[\,/,%%1]')" 
    33 
    4 cd .. 
    54for %f in (*.py) check %f 
    65cd orangeCanvas 
     
    87cd ..\orangeWidgets 
    98for /r %f in (*.py;*.pyw) check %f 
    10 cd ..\scripts 
     9cd .. 
  • install-scripts/install3.nsi

    r5184 r5224  
    33UninstallIcon OrangeInstall.ico 
    44 
    5 !ifndef ORANGEDIR 
    6     !define ORANGEDIR orange 
    7 !endif 
    8  
    95!define PYFILENAME python-${NPYVER}.msi 
    10 !define PYWINFILENAME pywin32-210.win32-py${NPYVER}.exe 
     6!define PYWINFILENAME pywin32-212.win32-py${NPYVER}.exe 
    117 
    128OutFile ${OUTFILENAME} 
     
    123119                        Quit 
    124120            installpython23: 
    125                 File 3rdparty-23\Python-2.3.5.exe 
     121                File ${PARTY}\Python-2.3.5.exe 
    126122                ExecWait "$DESKTOP\Python-2.3.5.exe" 
    127123                Delete "$DESKTOP\Python-2.3.5.exe" 
     
    136132                StrCpy $0 "/Qb-" 
    137133            installpython: 
    138                 File 3rdparty-${PYVER}\${PYFILENAME} 
     134                File ${PARTY}\${PYFILENAME} 
    139135                ${If} $AdminInstall == 1 
    140136                    ExecWait 'msiexec.exe /i "$DESKTOP\${PYFILENAME}" ADDLOCAL=Extensions,Documentation,TclTk ALLUSERS=1 $0' $0 
     
    159155            have_mfc: 
    160156            SetOutPath $DESKTOP 
    161             File 3rdparty-${PYVER}\${PYWINFILENAME} 
     157            File ${PARTY}\${PYWINFILENAME} 
    162158            ExecWait "$DESKTOP\${PYWINFILENAME}" 
    163159            Delete "$DESKTOP\${PYWINFILENAME}" 
    164160    have_pythonwin: 
    165161 
    166  
    167         SetOutPath $PythonDir\lib\site-packages 
    168         IfFileExists $PythonDir\lib\site-packages\qt.py have_pyqt 
    169             File /r 3rdparty-${PYVER}\pyqt\*.* 
    170     have_pyqt: 
    171  
    172  
    173         IfFileExists $PythonDir\lib\site-packages\qwt\*.* have_pyqwt 
    174             File /r 3rdparty-${PYVER}\qwt 
    175     have_pyqwt: 
    176  
    177  
    178         IfFileExists $PythonDir\lib\site-packages\Numeric\*.* have_numeric 
    179             File /r 3rdparty-${PYVER}\numeric 
    180             File various\Numeric.pth 
    181     have_numeric: 
    182  
    183  
    184         IfFileExists $PythonDir\lib\site-packages\numpy\*.* have_numpy 
    185             File /r 3rdparty-${PYVER}\numpy 
    186     have_numpy: 
    187  
    188  
    189         IfFileExists "$PythonDir\lib\site-packages\qt-mt230nc.dll" have_qt 
    190         IfFileExists "$SysDir\qt-mt230nc.dll" have_qt 
    191             File various\qt-mt230nc.dll 
    192             SetOutPath $INSTDIR 
    193             File various\QT-LICENSE.txt 
    194         have_qt: 
    195  
     162        !if ${QTVER} == 23 
     163                SetOutPath $PythonDir\lib\site-packages 
     164                IfFileExists $PythonDir\lib\site-packages\qt.py have_pyqt 
     165                    File /r ${PARTY}\pyqt\*.* 
     166            have_pyqt: 
     167 
     168 
     169                IfFileExists $PythonDir\lib\site-packages\qwt\*.* have_pyqwt 
     170                    File /r ${PARTY}\qwt 
     171            have_pyqwt: 
     172 
     173 
     174                IfFileExists $PythonDir\lib\site-packages\Numeric\*.* have_numeric 
     175                    File /r ${PARTY}\numeric 
     176                    File various\Numeric.pth 
     177            have_numeric: 
     178 
     179 
     180                IfFileExists $PythonDir\lib\site-packages\numpy\*.* have_numpy 
     181                    File /r ${PARTY}\numpy 
     182            have_numpy: 
     183 
     184 
     185                IfFileExists "$PythonDir\lib\site-packages\qt-mt230nc.dll" have_qt 
     186                IfFileExists "$SysDir\qt-mt230nc.dll" have_qt 
     187                    File various\qt-mt230nc.dll 
     188                    SetOutPath $INSTDIR 
     189                    File various\QT-LICENSE.txt 
     190            have_qt: 
     191        !else 
     192            MessageBox MB_OK "Installation will check for various needed libraries$\r$\nand launch their installers if needed." 
     193            SetOutPath $DESKTOP 
     194             
     195                IfFileExists $PythonDir\lib\site-packages\numpy-1.1.0-py2.5.egg-info have_numpy 
     196                    File ${PARTY}\numpy-1.1.0-win32-superpack-python2.5.exe 
     197                    ExecWait $DESKTOP\numpy-1.1.0-win32-superpack-python2.5.exe 
     198                    Delete $DESKTOP\numpy-1.1.0-win32-superpack-python2.5.exe 
     199                     
     200            have_numpy: 
     201                IfFileExists $PythonDir\lib\site-packages\PyQt4\*.* have_pyqt 
     202                    File ${PARTY}\PyQt-Py2.5-gpl-4.4.2-1.exe 
     203                    ExecWait $DESKTOP\PyQt-Py2.5-gpl-4.4.2-1.exe 
     204                    Delete $DESKTOP\PyQt-Py2.5-gpl-4.4.2-1.exe 
     205                     
     206            have_pyqt: 
     207                IfFileExists $PythonDir\lib\site-packages\PyQt4\Qwt5\*.* have_pyqwt 
     208                    File ${PARTY}\PyQwt5.1.0-Python2.5-PyQt4.4.2-NumPy1.1.0-1.exe 
     209                    ExecWait $DESKTOP\PyQwt5.1.0-Python2.5-PyQt4.4.2-NumPy1.1.0-1.exe 
     210                    Delete $DESKTOP\PyQwt5.1.0-Python2.5-PyQt4.4.2-NumPy1.1.0-1.exe 
     211             
     212            have_pyqwt: 
     213        !endif 
     214                     
     215                     
     216                     
     217                     
     218           
    196219SectionEnd 
    197220!endif 
     
    217240    StrCpy $INSTDIR  "$PythonDir\lib\site-packages\orange" 
    218241    SetOutPath $INSTDIR 
    219     File /r ${ORANGEDIR}\* 
     242    File /r /x .svn ${ORANGEDIR}\* 
    220243 
    221244    !ifdef INCLUDEGENOMICS 
     
    276299    !ifndef COMPLETE 
    277300        StrCmp $PythonDir "" 0 have_python 
    278             MessageBox MB_OK "Please install Python first (www.python.org)$\r$\nor download Orange which includes Python." 
     301            MessageBox MB_OK "Please install Python first (www.python.org)$\r$\nor download Orange distribution that includes Python." 
    279302            Quit 
    280303        have_python: 
     
    290313 
    291314        StrCmp $MissingModules "" continueinst 
    292         MessageBox MB_YESNO "Missing module(s): $MissingModules$\r$\n$\r$\nThese module(s) are not needed for running scripts in Orange, but Orange Canvas will not work without them.$\r$\nYou can download and install them later or obtain an Orange installation that includes them.$\r$\n$\r$\nContinue with installation?" /SD IDYES IDYES continueinst 
     315        MessageBox MB_YESNO "Missing module(s): $MissingModules$\r$\n$\r$\nWithout these modules you can still scripts in Orange, but Orange Canvas will not work without them.$\r$\nYou can download and install them later or obtain the Orange installation that includes them.$\r$\n$\r$\nContinue with installation?" /SD IDYES IDYES continueinst 
    293316        Quit 
    294317        continueinst: 
  • install-scripts/updateCommon__.btm

    r5184 r5224  
    1 call updateSetConstants__.btm %1 %2 
     1call updateSetConstants__.btm %1 %2 %3 
    22 
    3 if not exist %TMPDIR mkdir %TMPDIR 
    4 break_on_error 
    5 del /syefkq %TMPDIR 
    6 cdd %TMPDIR 
    7  
    8 svn export --quiet http://www.ailab.si/svn/orange/%BRANCH/orange orange 
    9 svn export --quiet http://www.ailab.si/svn/orange/%BRANCH/source source 
    10 del /syefkqx orange/orangeWidgets/Prototypes 
    11  
    12 rem call %SCRIPTDIR/winCompileAddOns.btm 
     3svn update orange 
     4svn update source 
    135 
    146cdd %TMPDIR\source 
     
    2315  rem if exist %COMPILELOG del %COMPILELOG 
    2416  set PYTHON=%PYTHONBASE%%pyver 
     17  set OBJPOSTFIX=-%2 
     18  set PYORANGEDIR=c:\Python%pyver\lib\site-packages\orange 
     19  set PARTY=%SCRIPTDIR\%3\%pyver 
     20  if not direxist %PARTY goto skipversion 
    2521   
    2622  rem start /wait  
    27   rem vcexpress orange.sln /build Release /out %COMPILELOG 
     23  pushd 
     24  cd %PYORANGEDIR 
     25  del orange.pyd corn.pyd statc.pyd orangene.pyd orangeom.pyd 
     26  popd 
     27  rem except (%PYORANGEDIR\*_d.pyd) del /q %PYORANGEDIR\*.pyd 
     28  vcexpress orange.sln /build Release /out %COMPILELOG 
    2829  flag_on_error 
    2930 
    30   cdd c:\Python%pyver\lib\site-packages\orange 
    31   for %pydf in (*.pyd) do ( 
     31  cdd %PYORANGEDIR 
     32  except (*_d.pyd) for %pydf in (*.pyd) do ( 
    3233    if exist %TMPDIR\orange\%pydf del %TMPDIR\orange\%pydf 
    3334    upx %pydf -o %TMPDIR/orange/%pydf 
     
    3536 
    3637  cdd %SCRIPTDIR 
    37   set COMMON_NSI_OPTIONS=/DORANGEDIR=%TMPDIR\orange /DCWD=%SCRIPTDIR /DPYVER=%pyver /DNPYVER=%npver install3.nsi 
    38   nsis /Onsis_standard-py%npver.log /DOUTFILENAME="%TMPDIR\%WIN-py%npver.exe" %COMMON_NSI_OPTIONS %+ 
     38  set COMMON_NSI_OPTIONS=/DORANGEDIR=%TMPDIR\orange /DPYVER=%pyver /DNPYVER=%npver /DPARTY=%PARTY /DQTVER=%@SUBSTR[%3,2,2] install3.nsi 
     39  nsis /O%TMPDIR/nsis-%WIN-py%npver.log /DOUTFILENAME="%TMPDIR\%WIN-py%npver.exe" %COMMON_NSI_OPTIONS %+ 
    3940  flag_on_error 
    40   nsis /Onsis_complete-py%npver.log /DCOMPLETE /DOUTFILENAME="%TMPDIR\%WIN_PYTHON-py%npver.exe" %COMMON_NSI_OPTIONS 
     41  nsis /O%TMPDIR/nsis-%WIN-py-py%npver.log /DCOMPLETE /DOUTFILENAME="%TMPDIR\%WIN_PYTHON-py%npver.exe" %COMMON_NSI_OPTIONS 
    4142  flag_on_error 
     43   
     44  :skipversion 
    4245)  
    4346 
  • install-scripts/updateMajorRelease.btm

    r1044 r5224  
     1set verstr=%1 
    12call updateSetConstants__.btm 
    2  
    3 set orangeMinorVersion=0 
    4 set orangeMajorVersion=%@eval[orangeMajorVersion+1] 
    5 set verstr=%orangeReleaseVersion.%orangeMajorVersion 
    6  
    73call updateCommon__.btm 
  • install-scripts/updateSetConstants__.btm

    r5184 r5224  
    11rem Popravki za doma: 
    22rem - set /r filenames.set 
    3 rem - alias vcexpress 
     3rem - alias vcexpress  in ostalo za vc8 
     4rem - pythonbase 
     5 
    46set verstr=%1 
    5 set BRANCH=%2 
    67echo Building Orange version '%verstr' from SVN's branch '%BRANCH' 
     8 
     9set SCRIPTDIR=%_CWD 
     10set BUILDDIR=%SCRIPTDIR 
     11set TMPDIR=%SCRIPTDIR\%2 
     12set WEBDOWNLOAD=O:\2 
    713 
    814set daystr=%_YEAR-%@format[02,%_MONTH]-%@format[02,%_DAY] 
    915set nicedate=%_DAY %@INSTR[%@EVAL[3*%_MONTH-3],3,JanFebMarAprMayJunJulAugSepOctNovDec] %_YEAR 
    10  
    11 set SCRIPTDIR=%_CWD 
    12 set BUILDDIR=%SCRIPTDIR 
    13 set TMPDIR=%SCRIPTDIR\tmp 
    14 set WEBDOWNLOAD=O:\2 
    1516 
    1617rem set MAIL_TO="tomaz.curk@fri.uni-lj.si,janez.demsar@fri.uni-lj.si,marko.toplak@fri.uni-lj.si" 
     
    3940 
    4041set PYTHONBASE=c:\Python 
    41 set PYTHONVERSIONS=23 24 25 
     42set PYTHONVERSIONS=25 24 23 
    4243 
    4344alias nsis="c:\program files\nsis\makensis.exe" 
  • install-scripts/updateVersionsPy__.btm

    r5184 r5224  
    2323set foo=%@FILECLOSE[%fhandle] 
    2424 
    25 set fhandle=%@FILEOPEN[%SCRIPTDIR\versions.set, write, t] 
    26 set foo=%@FILEWRITE[%fhandle,orangeMajorVersion=%orangeMajorVersion] 
    27 set foo=%@FILEWRITE[%fhandle,orangeMinorVersion=%orangeMinorVersion] 
    28 set foo=%@FILEWRITE[%fhandle,orangeReleaseVersion=%orangeReleaseVersion] 
    29 set foo=%@FILECLOSE[%fhandle] 
Note: See TracChangeset for help on using the changeset viewer.