Commits

Aleš Erjavec committed e578118

Using hg repo in the windows packaging scripts for snapshots.

  • Participants
  • Parent commits 2b83972

Comments (0)

Files changed (4)

File install-scripts/createCommonAddOns__.btm

   echo *************************************
   echo *************************************
   echo *** Compiling Orange Bioinformatics for Python %pyver
-  cdd %TMPDIR\add-ons\Bioinformatics
+  cdd %TMPDIR\Bioinformatics
   del /syeq build
   del /syeq dist
 
   set PYTHON=%PYTHONBASE%%pyver
   %PYTHON\python setup.py build -c mingw32 bdist_wininst > %COMPILELOG
   break_on_error
-rem when compiled:  move /z %TMPDIR\add-ons\Bioinformatics\dist\*.win32-py%npver.exe %TMPDIR\%PKG_BIOINFORMATICS-py%npver.exe
-  move /z %TMPDIR\add-ons\Bioinformatics\dist\*.win32.exe %TMPDIR\%PKG_BIOINFORMATICS-py%npver.exe
+rem when compiled:  move /z %TMPDIR\Bioinformatics\dist\*.win32-py%npver.exe %TMPDIR\%PKG_BIOINFORMATICS-py%npver.exe
+  move /z %TMPDIR\Bioinformatics\dist\*.win32.exe %TMPDIR\%PKG_BIOINFORMATICS-py%npver.exe
 
   REM # publish, add record to stamps_pyd.txt, needed for update from web (accessed by updateFromSVN.bat)  
   set TMPBINDIR=%TMPDIR\binaries\%pyver\add-ons\Bioinformatics
   if not direxist %TMPBINDIR mkdir /s %TMPBINDIR
   
-  cdd %TMPDIR\add-ons\Bioinformatics\build\lib.win32-%npver
+  cdd %TMPDIR\Bioinformatics\build\lib.win32-%npver
   for %pydf in (*.pyd) do (
     copy %pydf %TMPBINDIR
     set MD5=%@MD5[%pydf]
   echo *************************************
   echo *************************************
   echo *** Compiling TEXT MINING for Python %pyver 
-  cdd %TMPDIR\add-ons\Text
+  cdd %TMPDIR\Text
   del /syeq build
   del /syeq dist
 
   set PYTHON=%PYTHONBASE%%pyver
   %PYTHON\python setup.py build -c mingw32 bdist_wininst > %COMPILELOG
   rem break_on_error
-  move /z %TMPDIR\add-ons\Text\dist\*.win32-py%npver.exe %TMPDIR\%PKG_TEXT-py%npver.exe
+  move /z %TMPDIR\Text\dist\*.win32-py%npver.exe %TMPDIR\%PKG_TEXT-py%npver.exe
 
   REM # publish, add record to stamps_pyd.txt, needed for update from web (accessed by updateFromSVN.bat)  
   set TMPBINDIR=%TMPDIR\binaries\%pyver\add-ons\Text
   if not direxist %TMPBINDIR mkdir /s %TMPBINDIR
 
-  cdd %TMPDIR\add-ons\Text\build\lib.win32-%npver
+  cdd %TMPDIR\Text\build\lib.win32-%npver
   for %pydf in (*.pyd) do (
     copy %pydf %TMPBINDIR
     set MD5=%@MD5[%pydf]

File install-scripts/createSnapshot.btm

 rem # - SVN is updated to head
 
 call updateSetVariables__.btm snapshot
-set WIN_SNAPSHOT=orange-win-snapshot-%daystr
-set WIN_PYTHON_SNAPSHOT=orange-win-w-python-snapshot-%daystr
+set WIN_SNAPSHOT=orange-win-snapshot-hg-%daystr
+set WIN_PYTHON_SNAPSHOT=orange-win-w-python-snapshot-hg-%daystr
 set ADDON_BIOINFORMATICS_SNAPSHOT=orangeAddOn-bioinformatics-snapshot-%daystr
 set ADDON_TEXT_SNAPSHOT=orangeAddOn-text-snapshot-%daystr
 set SOURCE_SNAPSHOT=orange-source-snapshot-%daystr.zip
 
 rem # update source(s) to revision HEAD
 cdd %TMPDIR
-svn cleanup
-svn update --ignore-externals
+
+hg pull --update
 
 rem # build core
 cdd %SCRIPTDIR
 
 rem # if no errors then publish on web (everything at the same time)
 rem # remove any old files
-except (%DOWNLOADDIR\orange*-snapshot-%daystr-*.exe) del %DOWNLOADDIR\orange*-snapshot-????-??-??-*.exe
+REM except (%DOWNLOADDIR\orange*-snapshot-%daystr-*.exe) del %DOWNLOADDIR\orange*-snapshot-????-??-??-*.exe
 
 rem # pack sources
 cdd %TMPDIR
 del /syeqtx sourcestopack
-mkdir sourcestopack
+
+hg archive sourcestopack
+
 cd sourcestopack
-svn export --native-eol LF -q http://orange.biolab.si/svn/orange/trunk/orange
-cd orange
-del *.pyd *.dll *.bat
-svn export --native-eol LF -q http://orange.biolab.si/svn/orange/trunk/source 
-copy doc\LICENSES .
-copy doc\COPYING .
-copy doc\LICENSES source
-copy doc\COPYING source
+
 rem # build source distribution
-e:\Python26\python.exe setup.py sdist 
-del %DOWNLOADDIR\orange-source-snapshot-????-??-??.zip
+e:\Python27\python.exe setup.py sdist
+rem # build msi file
+e:\Python27\python.exe setup.py bdist_msi
+rem del %DOWNLOADDIR\orange-source-snapshot-????-??-??.zip
 move /z dist\Orange-?.*.zip %DOWNLOADDIR\%SOURCE_SNAPSHOT
+move /z dist\Orange-?.*.msi %DOWNLOADDIR\%WIN_SNAPSHOT.msi
 
 rem # publish
 cdd %TMPDIR
 
 rem # remember new filenames
 cdd %SCRIPTDIR
-call updateVersionsPy__.btm
+rem # Don't update the visible versions for now
+rem call updateVersionsPy__.btm

File install-scripts/updateAndCall.btm

-net use o: \\ailab.si\download
+
 cdd e:\orange\scripts
-svn update -N
-svn export http://orange.biolab.si/svn/orange/trunk/orange/doc/LICENSES license.txt
-svn 
+
+
+REM # Until orange-install-scripts repo is up this does not yet run
+REM hg clone https://bitbucket.org/biolab/orange-install-scripts .
+REM hg pull --update 
+
+REM hg clone https://bitbucket.org/biolab/orange snapshot
+cdd snapshot
+hg pull --update
+
+REM hg clone https://bitbucket.org/biolab/orange-addon-bioinformatics Bioinformatics
+cdd Bioinformatics
+hg pull --update
+
+cdd  e:\orange\scripts\snapshot
+
+REM hg clone https://bitbucket.org/biolab/orange-addon-text Text
+cdd Text
+hg pull --update
+
+cdd e:\orange\scripts
+
+copy /r snapshot\install-scripts\* .
+
+#svn update -N
+#svn export http://orange.biolab.si/svn/orange/trunk/orange/doc/LICENSES license.txt
+#svn
+ 
 call callCreateSnapshot.btm
 shutdown -s

File install-scripts/updateSetVariables__.btm

 REM # set paths to orange sources and format date
 set SCRIPTDIR=%_CWD
 set TMPDIR=%SCRIPTDIR\%1
+set SOURCEDIR=%TMPDIR\source
 set DOWNLOADDIR=Z:\Volumes\download\
 
 REM # read filenames of current packages