fix windows scripts

Microaster
1 parent 1cb14468
Showing 6 changed files with 25 additions and 24 deletions Show diff stats
Comet
install/REQUIREMENTS_WINDOWS.txt
install/install_requirements_windows.bat
install/windows/mysqlclient-1.3.7-cp35-cp35m-win32.whl
pyrosrun.bat
src/alert_manager/_trial_temp/ivo__test.ivorn_12345678
@@ -0,0 +1 @@
+Subproject commit c1ccef65dacbbcd784e4fc7e2c5befe6001ac408
@@ -23,4 +23,4 @@ six==1.10.0
 sqlparse==0.1.19
 Twisted==16.0.0
 virtualenv==15.0.1
 -zope.interface==4.1.1
+zope.interface==4.1.1
 \ No newline at end of file
@@ -15,9 +15,9 @@ REM String variables
  
 SET ASK_USE_MYSQL=-Do you wish to use mysql in your project ? Only if mysql-server is installed. (Y/N)
 SET ASK_MYSQL_USERNAME=-MySQL server login (default 'root'): 
-SET SQL_SCRIPT=CREATE DATABASE IF NOT EXISTS pyros; DROP USER IF EXISTS '%DB_USER%'; GRANT ALL ON pyros.* TO '%DB_USER%'@'localhost' INDENTIFIED BY '%DB_PASSWORD%'; GRANT ALL ON test_pyros.* TO '%DB_USER%'@'localhost'
+SET SQL_SCRIPT=CREATE DATABASE IF NOT EXISTS pyros; DROP USER IF EXISTS '%DB_USER%'; GRANT ALL ON pyros.* TO '%DB_USER%'@'localhost' IDENTIFIED BY '%DB_PASSWORD%'; GRANT ALL ON test_pyros.* TO '%DB_USER%'@'localhost'
 SET SQL_FAIL=-Failed to execute database script, probably due to a wrong username or password
-SET TELL_MYSQL_CREATIONS=-Created pyros database.\n-Created new user '%DB_USER%' with password '%DB_PASSWORD%'
+SET TELL_MYSQL_CREATIONS=-Created pyros database. -Created new user '%DB_USER%' with password '%DB_PASSWORD%'
 SET USE_SQLITE=-Sqlite will be used by default. There is no required configuration.
  
 SET PRIVATE_DIR_CREATE=-Created 'private' directory
@@ -123,19 +123,19 @@ echo %UPGRADE_WHEEL%
 pip install --upgrade wheel
  
 REM Install specific to windows
-copy ..\install\windows\voevent* %VENV_NAME%\Lib\site-packages
-pip install ..\install\windows\*.whl
+FOR /D %%G in ("..\install\windows\*") DO xcopy /E /I %%G %VENV_NAME%\Lib\site-packages\%%~nxG
+
+pip install ..\install\windows\lxml-3.6.0-cp35-cp35m-win32.whl
+
  
 REM Install the needed python packages
 echo %INSTALL_PACKAGES%
  
 pip install -r ../install/REQUIREMENTS_WINDOWS.txt
  
-REM IF %MYSQL% NEQ 0 (
-REM 	pip install -r ../install/REQUIREMENTS.txt
-REM ) ELSE (
-REM 	pip install -r ../install/REQUIREMENTS_SQLITE.txt
-REM )
+IF %MYSQL% NEQ 0 (
+	pip install ..\install\windows\mysqlclient-1.3.7-cp35-cp35m-win32.whl
+)
  
 REM Create the database content and a superuser pyros
 cd ../src/
 @echo off
  
-set NEEDED_ARGUMENT=One argument is needed. Possible arguments : [runserver|test]
-set INVALID_ARGUMENT=Invalid argument. Possible arguments : [runserver|test]
+set NEEDED_ARGUMENT=One argument is needed. Possible arguments : "[server|test]"
+set INVALID_ARGUMENT=Invalid argument. Possible arguments : "[server|test]"
  
-private/venv_py35_pyros/Scripts/activate
+call private/venv_py35_pyros/Scripts/activate
  
 set argC=0
 for %%x in (%*) do Set /A argC+=1
  
  
-if %argC% NEQ 1 (
+if "%argC%" NEQ "1" (
 	echo %NEEDED_ARGUMENT%
 	pause
-	exit
-)
-
-cd src/
-
-if %1%==server (
-	python manage.py runserver
-) else if %1%==test(
-	python manage.py test
 ) else (
-	echo %INVALID_ARGUMENT%
+	cd src/
+
+	if "%1%" == "server" (
+		python manage.py runserver
+	) else if "%1%" == "test" (
+		python manage.py test
+	) else (
+		echo %INVALID_ARGUMENT%
+	)
 )
  
+
 pause