Moves dist to scripts/dist

VisTrails · Jul 15, 2014 · 73b5134 · 73b5134
1 parent 80b3056
commit 73b5134
Show file tree

Hide file tree

Showing 55 changed files with 15 additions and 15 deletions.
diff --git a/...on/splash/Franklin Gothic No. 2 Roman.ttf → ...on/splash/Franklin Gothic No. 2 Roman.ttf b/...on/splash/Franklin Gothic No. 2 Roman.ttf → ...on/splash/Franklin Gothic No. 2 Roman.ttf
diff --git a/dist/common/splash/README → scripts/dist/common/splash/README b/dist/common/splash/README → scripts/dist/common/splash/README
diff --git a/dist/common/splash/splash.ai → scripts/dist/common/splash/splash.ai b/dist/common/splash/splash.ai → scripts/dist/common/splash/splash.ai
diff --git a/dist/common/splash/splash.svg → scripts/dist/common/splash/splash.svg b/dist/common/splash/splash.svg → scripts/dist/common/splash/splash.svg
diff --git a/dist/common/wiki_header/header.ai → scripts/dist/common/wiki_header/header.ai b/dist/common/wiki_header/header.ai → scripts/dist/common/wiki_header/header.ai
diff --git a/dist/common/wiki_header/header.jpg → scripts/dist/common/wiki_header/header.jpg b/dist/common/wiki_header/header.jpg → scripts/dist/common/wiki_header/header.jpg
diff --git a/dist/common/wiki_header/header.png → scripts/dist/common/wiki_header/header.png b/dist/common/wiki_header/header.png → scripts/dist/common/wiki_header/header.png
diff --git a/dist/common/wiki_header/header_fill.png → ...s/dist/common/wiki_header/header_fill.png b/dist/common/wiki_header/header_fill.png → ...s/dist/common/wiki_header/header_fill.png
diff --git a/dist/mac/Input/CLToolsWizard.command → scripts/dist/mac/Input/CLToolsWizard.command b/dist/mac/Input/CLToolsWizard.command → scripts/dist/mac/Input/CLToolsWizard.command
diff --git a/dist/mac/Input/LICENSE → scripts/dist/mac/Input/LICENSE b/dist/mac/Input/LICENSE → scripts/dist/mac/Input/LICENSE
diff --git a/dist/mac/Input/README → scripts/dist/mac/Input/README b/dist/mac/Input/README → scripts/dist/mac/Input/README
diff --git a/dist/mac/Input/VisTrails.command → scripts/dist/mac/Input/VisTrails.command b/dist/mac/Input/VisTrails.command → scripts/dist/mac/Input/VisTrails.command
diff --git a/dist/mac/Input/qt.conf → scripts/dist/mac/Input/qt.conf b/dist/mac/Input/qt.conf → scripts/dist/mac/Input/qt.conf
diff --git a/dist/mac/fix_itk_libraries.py → scripts/dist/mac/fix_itk_libraries.py b/dist/mac/fix_itk_libraries.py → scripts/dist/mac/fix_itk_libraries.py
diff --git a/dist/mac/fix_qtplugin_libs.py → scripts/dist/mac/fix_qtplugin_libs.py b/dist/mac/fix_qtplugin_libs.py → scripts/dist/mac/fix_qtplugin_libs.py
diff --git a/dist/mac/make_app → scripts/dist/mac/make_app b/dist/mac/make_app → scripts/dist/mac/make_app
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 # usage: make_app volname
-#      example: ./make_app vistrails-mac-10.5-intel-1.3.1-rev1646
+#      example: scripts/dist/make_app vistrails-mac-10.5-intel-1.3.1-rev1646
 #
 # Creates a disk image (dmg) of VisTrails on Mac OS X from the command line.
 #

diff --git a/dist/mac/make_app_itk → scripts/dist/mac/make_app_itk b/dist/mac/make_app_itk → scripts/dist/mac/make_app_itk
diff --git a/...es/splash/Franklin Gothic No. 2 Roman.ttf → ...es/splash/Franklin Gothic No. 2 Roman.ttf b/...es/splash/Franklin Gothic No. 2 Roman.ttf → ...es/splash/Franklin Gothic No. 2 Roman.ttf
diff --git a/dist/mac/resources/splash/splash.ai → scripts/dist/mac/resources/splash/splash.ai b/dist/mac/resources/splash/splash.ai → scripts/dist/mac/resources/splash/splash.ai
diff --git a/dist/mac/resources/vistrails_icon.icns → ...ts/dist/mac/resources/vistrails_icon.icns b/dist/mac/resources/vistrails_icon.icns → ...ts/dist/mac/resources/vistrails_icon.icns
diff --git a/dist/mac/resources/vistrails_icon_small.icns → ...t/mac/resources/vistrails_icon_small.icns b/dist/mac/resources/vistrails_icon_small.icns → ...t/mac/resources/vistrails_icon_small.icns
diff --git a/dist/mac/setup.py → scripts/dist/mac/setup.py b/dist/mac/setup.py → scripts/dist/mac/setup.py
diff --git a/dist/mac/setup_itk.py → scripts/dist/mac/setup_itk.py b/dist/mac/setup_itk.py → scripts/dist/mac/setup_itk.py
diff --git a/dist/mac/vistrails.dmgCanvas → scripts/dist/mac/vistrails.dmgCanvas b/dist/mac/vistrails.dmgCanvas → scripts/dist/mac/vistrails.dmgCanvas
diff --git a/dist/source/make-vistrails-src-nightly.py → ...dist/source/make-vistrails-src-nightly.py b/dist/source/make-vistrails-src-nightly.py → ...dist/source/make-vistrails-src-nightly.py
@@ -45,7 +45,7 @@
 EXPORT_DIR_SUFFIX = "-?"
 
 # Paths of files and/or directories to be removed from the exported repository (relative to export dir)
-EXPORT_DELETE_PATHS = [".git", ".gitignore", "dist", "packages"]
+EXPORT_DELETE_PATHS = [".git", ".gitignore", "scripts/dist", "packages"]
 
 # Distribution Tarball name (Do not add ".tar.gz")
 TARBALL_NAME = "vistrails-src-nightly"
@@ -115,7 +115,7 @@ def last_minute_changes():
     global SF_DO_UPLOAD
 
     # Copy License
-    srcfile = "dist/mac/Input/LICENSE"
+    srcfile = "scripts/dist/mac/Input/LICENSE"
     info("Copying '%s' to export base dir ..." % srcfile)
     try:
         shutil.copy(os.path.join(EXPORT_DIRNAME, srcfile), os.path.join(EXPORT_DIRNAME, os.path.basename(srcfile)))

diff --git a/dist/source/make-vistrails-src-release.py → ...dist/source/make-vistrails-src-release.py b/dist/source/make-vistrails-src-release.py → ...dist/source/make-vistrails-src-release.py
@@ -54,7 +54,7 @@
 EXPORT_DIR_SUFFIX = "-?"
 
 # Paths of files and/or directories to be removed from the exported repository (relative to export dir)
-EXPORT_DELETE_PATHS = [".git", ".gitignore", "dist", "packages"]
+EXPORT_DELETE_PATHS = [".git", ".gitignore", "scripts/dist", "packages"]
 
 # Distribution Tarball name (Do not add ".tar.gz")
 # For releases, Tarball name will be always EXPORT_DIR_PREFIX+EXPORT_DIR_SUFFIX 
@@ -128,7 +128,7 @@ def last_minute_changes():
     global SF_DO_UPLOAD
 
     # Copy License
-    srcfile = "dist/mac/Input/LICENSE"
+    srcfile = "scripts/dist/mac/Input/LICENSE"
     info("Copying '%s' to export base dir ..." % srcfile)
     try:
         shutil.copy(os.path.join(EXPORT_DIRNAME, srcfile), os.path.join(EXPORT_DIRNAME, os.path.basename(srcfile)))
@@ -165,7 +165,7 @@ def last_minute_changes():
             f.close()
     if RELEASE:
         #Copy Release Notes
-        srcfile = "dist/windows/Input/releaseNotes.txt"
+        srcfile = "scripts/dist/windows/Input/releaseNotes.txt"
         destfile = "RELEASE"
         info("Copying '%s' to export base dir ..." % srcfile)
         try:

diff --git a/dist/ubuntu/_debian/control → scripts/dist/ubuntu/_debian/control b/dist/ubuntu/_debian/control → scripts/dist/ubuntu/_debian/control
diff --git a/dist/ubuntu/_debian/copyright → scripts/dist/ubuntu/_debian/copyright b/dist/ubuntu/_debian/copyright → scripts/dist/ubuntu/_debian/copyright
diff --git a/dist/ubuntu/create_debian_pkg.sh → scripts/dist/ubuntu/create_debian_pkg.sh b/dist/ubuntu/create_debian_pkg.sh → scripts/dist/ubuntu/create_debian_pkg.sh
diff --git a/dist/windows/Input/bookmarks.xml → scripts/dist/windows/Input/bookmarks.xml b/dist/windows/Input/bookmarks.xml → scripts/dist/windows/Input/bookmarks.xml
diff --git a/dist/windows/Input/download_usersguide.py → ...dist/windows/Input/download_usersguide.py b/dist/windows/Input/download_usersguide.py → ...dist/windows/Input/download_usersguide.py
diff --git a/dist/windows/Input/git.exe → scripts/dist/windows/Input/git.exe b/dist/windows/Input/git.exe → scripts/dist/windows/Input/git.exe
diff --git a/dist/windows/Input/libiconv-2.dll → scripts/dist/windows/Input/libiconv-2.dll b/dist/windows/Input/libiconv-2.dll → scripts/dist/windows/Input/libiconv-2.dll
diff --git a/dist/windows/Input/libiconv2.dll → scripts/dist/windows/Input/libiconv2.dll b/dist/windows/Input/libiconv2.dll → scripts/dist/windows/Input/libiconv2.dll
diff --git a/dist/windows/Input/libintl-2.dll → scripts/dist/windows/Input/libintl-2.dll b/dist/windows/Input/libintl-2.dll → scripts/dist/windows/Input/libintl-2.dll
diff --git a/dist/windows/Input/license.txt → scripts/dist/windows/Input/license.txt b/dist/windows/Input/license.txt → scripts/dist/windows/Input/license.txt
diff --git a/dist/windows/Input/qt.conf → scripts/dist/windows/Input/qt.conf b/dist/windows/Input/qt.conf → scripts/dist/windows/Input/qt.conf
diff --git a/dist/windows/Input/releaseNotes.txt → scripts/dist/windows/Input/releaseNotes.txt b/dist/windows/Input/releaseNotes.txt → scripts/dist/windows/Input/releaseNotes.txt
diff --git a/dist/windows/Input/runvistrails.py → scripts/dist/windows/Input/runvistrails.py b/dist/windows/Input/runvistrails.py → scripts/dist/windows/Input/runvistrails.py
diff --git a/dist/windows/Input/startup.py → scripts/dist/windows/Input/startup.py b/dist/windows/Input/startup.py → scripts/dist/windows/Input/startup.py
diff --git a/dist/windows/Input/tar.exe → scripts/dist/windows/Input/tar.exe b/dist/windows/Input/tar.exe → scripts/dist/windows/Input/tar.exe
diff --git a/dist/windows/Input/unzip.exe → scripts/dist/windows/Input/unzip.exe b/dist/windows/Input/unzip.exe → scripts/dist/windows/Input/unzip.exe
diff --git a/dist/windows/Input/unzip32.dll → scripts/dist/windows/Input/unzip32.dll b/dist/windows/Input/unzip32.dll → scripts/dist/windows/Input/unzip32.dll
diff --git a/dist/windows/Input/zip.exe → scripts/dist/windows/Input/zip.exe b/dist/windows/Input/zip.exe → scripts/dist/windows/Input/zip.exe
diff --git a/dist/windows/custom/vistrails-gdal.iss → ...ts/dist/windows/custom/vistrails-gdal.iss b/dist/windows/custom/vistrails-gdal.iss → ...ts/dist/windows/custom/vistrails-gdal.iss
@@ -199,7 +199,7 @@ CompileLogFile=Output\build.log
 CompileLogMethod=append
 
 [PreCompile]
-Name: "C:\Python27\python.exe"; Parameters: "C:\Users\vistrails\code\vistrails\dist\windows\Input\download_usersguide.py"; Flags: abortonerror cmdprompt
+Name: "C:\Python27\python.exe"; Parameters: "C:\Users\vistrails\code\vistrails\scripts\dist\windows\Input\download_usersguide.py"; Flags: abortonerror cmdprompt
 
 [Code]
 var
@@ -309,4 +309,4 @@ LogFile=Output\build.log
 LogFileOverwrite=false
 
 [InnoIDE_PreCompile]
-Name: C:\Python27\python.exe; Parameters: C:\Users\vistrails\code\vistrails\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt; 
+Name: C:\Python27\python.exe; Parameters: C:\Users\vistrails\code\vistrails\scripts\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt; 
diff --git a/dist/windows/custom/vistrailsx64-gdal.iss → ...dist/windows/custom/vistrailsx64-gdal.iss b/dist/windows/custom/vistrailsx64-gdal.iss → ...dist/windows/custom/vistrailsx64-gdal.iss
@@ -197,7 +197,7 @@ CompileLogFile=Output\build.log
 CompileLogMethod=append
 
 [PreCompile]
-Name: C:\Python27_64\python.exe; Parameters: C:\Users\vistrails\code\vistrails\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt;
+Name: C:\Python27_64\python.exe; Parameters: C:\Users\vistrails\code\vistrails\scripts\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt;
 
 [Code]
 var
@@ -307,4 +307,4 @@ LogFile=Output\build.log
 LogFileOverwrite=false
 
 [InnoIDE_PreCompile]
-Name: C:\Python27_64\python.exe; Parameters: C:\Users\vistrails\code\vistrails\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt; 
+Name: C:\Python27_64\python.exe; Parameters: C:\Users\vistrails\code\vistrails\scripts\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt; 
diff --git a/...resources/icons/src/vistrails_install.xcf → ...resources/icons/src/vistrails_install.xcf b/...resources/icons/src/vistrails_install.xcf → ...resources/icons/src/vistrails_install.xcf
diff --git a/...rces/icons/src/vistrails_install_flat.xcf → ...rces/icons/src/vistrails_install_flat.xcf b/...rces/icons/src/vistrails_install_flat.xcf → ...rces/icons/src/vistrails_install_flat.xcf
diff --git a/...ws/resources/icons/vistrails_install2.ico → ...ws/resources/icons/vistrails_install2.ico b/...ws/resources/icons/vistrails_install2.ico → ...ws/resources/icons/vistrails_install2.ico
diff --git a/...ndows/resources/images/vistrails_icon.bmp → ...ndows/resources/images/vistrails_icon.bmp b/...ndows/resources/images/vistrails_icon.bmp → ...ndows/resources/images/vistrails_icon.bmp
diff --git a/...ndows/resources/images/vistrails_icon.png → ...ndows/resources/images/vistrails_icon.png b/...ndows/resources/images/vistrails_icon.png → ...ndows/resources/images/vistrails_icon.png
diff --git a/...resources/images/vistrails_icon_small.bmp → ...resources/images/vistrails_icon_small.bmp b/...resources/images/vistrails_icon_small.bmp → ...resources/images/vistrails_icon_small.bmp
diff --git a/...resources/images/vistrails_icon_small.png → ...resources/images/vistrails_icon_small.png b/...resources/images/vistrails_icon_small.png → ...resources/images/vistrails_icon_small.png
diff --git a/dist/windows/vistrails.iss → scripts/dist/windows/vistrails.iss b/dist/windows/vistrails.iss → scripts/dist/windows/vistrails.iss
@@ -195,7 +195,7 @@ CompileLogFile=Output\build.log
 CompileLogMethod=append
 
 [PreCompile]
-Name: "C:\Python27\python.exe"; Parameters: "C:\Users\vistrails\code\vistrails\dist\windows\Input\download_usersguide.py"; Flags: abortonerror cmdprompt
+Name: "C:\Python27\python.exe"; Parameters: "C:\Users\vistrails\code\vistrails\scripts\dist\windows\Input\download_usersguide.py"; Flags: abortonerror cmdprompt
 
 [PreCompile]
 Name: "C:\Python27\python.exe"; Parameters: "-m compileall C:\Users\vistrails\code"; Flags: abortonerror cmdprompt
@@ -308,4 +308,4 @@ LogFile=Output\build.log
 LogFileOverwrite=false
 
 [InnoIDE_PreCompile]
-Name: C:\Python27\python.exe; Parameters: C:\Users\vistrails\code\vistrails\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt; 
+Name: C:\Python27\python.exe; Parameters: C:\Users\vistrails\code\vistrails\scripts\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt; 
diff --git a/dist/windows/vistrailsx64.iss → scripts/dist/windows/vistrailsx64.iss b/dist/windows/vistrailsx64.iss → scripts/dist/windows/vistrailsx64.iss
@@ -194,7 +194,7 @@ CompileLogFile=Output\build.log
 CompileLogMethod=append
 
 [PreCompile]
-Name: C:\Python27_64\python.exe; Parameters: C:\Users\vistrails\code\vistrails\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt;
+Name: C:\Python27_64\python.exe; Parameters: C:\Users\vistrails\code\vistrails\scripts\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt;
 
 [Code]
 var
@@ -304,4 +304,4 @@ LogFile=Output\build.log
 LogFileOverwrite=false
 
 [InnoIDE_PreCompile]
-Name: C:\Python27_64\python.exe; Parameters: C:\Users\vistrails\code\vistrails\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt; 
+Name: C:\Python27_64\python.exe; Parameters: C:\Users\vistrails\code\vistrails\scripts\dist\windows\Input\download_usersguide.py; Flags: AbortOnError CmdPrompt;