Skip to content

Commit

Permalink
Minor fix to build and run on output folder
Browse files Browse the repository at this point in the history
  • Loading branch information
mauritroviano committed Mar 3, 2014
1 parent 384981c commit 34983a5
Showing 1 changed file with 25 additions and 6 deletions.
31 changes: 25 additions & 6 deletions build.bat
Expand Up @@ -10,17 +10,14 @@ mingw32-make
mingw32-make install
cd ..\..


rem ========================= BUILD AND INSTALL PYQT ==========================
cd 3rdparty\PyQt-win-gpl
call configure.py --confirm-license
mingw32-make
mingw32-make install
cd ..\..

rem ============= PATCH CONFIGURATION FILES OF QWT AND QWTPLOT3D ==============
cd 3rdparty
call patch-configs.py
cd ..

rem ============================= BUILD QWT ===================================
cd 3rdparty\qwt
Expand All @@ -34,12 +31,26 @@ qmake
mingw32-make
cd ..\..

rem ========================= BUILD AND INSTALL LIBORIGIN ===========================
cd 3rdparty\liborigin
cmake -G "MinGW Makefiles"
mingw32-make
mkdir build
copy liborigin.a .\build
cd ..\..
rem =================== BUILD AND INSTALL SCIDAVIS ============================
qmake scidavis.pro
mingw32-make
mingw32-make INSTALL_ROOT=../output install
mingw32-make release

mingw32-make INSTALL_ROOT=./output install

rem ============ COPY SOME MISSING FILES TO OUTPUT DIRECTORY ==================
copy .\3rdparty\qwtplot3d\lib\qwtplot3d.dll .\output
copy .\3rdparty\zlib\bin\zlib1.dll .\output


copy .\scidavis\scidavis.exe .\output
copy .\scidavis\icons\scidavis.ico .\output
copy /y %QTDIR%\bin\mingwm10.dll output
copy /y %QTDIR%\bin\Qt3Support4.dll output
copy /y %QTDIR%\bin\QtAssistantClient4.dll output
Expand All @@ -51,3 +62,11 @@ copy /y %QTDIR%\bin\QtSql4.dll output
copy /y %QTDIR%\bin\QtSvg4.dll output
copy /y %QTDIR%\bin\QtXml4.dll output
copy /y %QTDIR%\bin\assistant.exe output
copy /y %QTDIR%\bin\libgcc_s_dw2-1.dll output
copy .\gpl.txt .\output
copy .\README .\output\README.txt
copy .\CHANGES .\output\CHANGES.txt
copy .\scidavis\scidavisrc.py .\output
copy .\scidavis\scidavisUtil.py .\output
copy C:\Python27\Lib\site-packages\sip.pyd .\output
copy C:\Python27\DLLs\python27.dll .\output

0 comments on commit 34983a5

Please sign in to comment.