Changes in / [66b63ee:d838715] in sasview

Files:

• build_tools/conda/README.md (modified) (1 diff)
• build_tools/conda/pyopencl/bld.bat (modified) (1 diff)
• sasview/setup_exe.py (modified) (1 diff)

build_tools/conda/README.md

@@ -48 +48 @@
 # $ conda config --set binstar_upload yes
 ```
-
-# Useful Links
-
-* http://conda.pydata.org/docs/build.html

build_tools/conda/pyopencl/bld.bat

@@ -1 @@
-xcopy %RECIPE_DIR%\bin %PREFIX%\DLLs /E
-xcopy %RECIPE_DIR%\include %PREFIX%\include /E
-xcopy %RECIPE_DIR%\lib %PREFIX%\libs /E
-
-xcopy %RECIPE_DIR%\bin %PREFIX%\Library\bin /E
-xcopy %RECIPE_DIR%\include %PREFIX%\Library\include /E
-xcopy %RECIPE_DIR%\lib %PREFIX%\Library\lib /E
-
-::"%PYTHON%" setup.py build -cmingw32
-"%PYTHON%" configure.py
-if errorlevel 1 exit 1
-"%PYTHON%" setup.py build
-if errorlevel 1 exit 1
 "%PYTHON%" setup.py install
 if errorlevel 1 exit 1

sasview/setup_exe.py

@@ -280 +280 @@
 # Copying the images directory to the distribution directory.
 for f in findall(images_dir):
-    if not ".svn" in f:
+    if os.path.split(f)[0].count('.svn')==0:
         data_files.append(("images", [f]))
 
 # Copying the HTML help docs
 for f in findall(media_dir):
-    if not ".svn" in f:
+    if os.path.split(f)[0].count('.svn')==0:
         data_files.append(("media", [f]))
 
 # Copying the sample data user data
 for f in findall(test_dir):
-    if not ".svn" in f:
+    if os.path.split(f)[0].count('.svn')==0:
         data_files.append(("test", [f]))