Commit 1c1d2dd2 authored by Federico Montesino Pouzols's avatar Federico Montesino Pouzols
Browse files

Updated links in deb readme nd script, and in tests and doc, re #10490

parent 994bc1a4
--Author: Owen Arnold
--Date: 06/March/2012
--Date: 06/March/2012, updated 14/Nov/2014
Info:
The bash script in this directory is used to build and package ParaView to Debian packages for Ubuntu platforms.
At the time of writing custom deployment is necessary for these reasons:
At the time of writing custom deployment is necessary for two reasons:
1) Current versions of Ubuntu distribute much older versions of ParaView from their repositories
2) The distributed source version of ParaView 3.10.1 contains bugs which we have fixed in our modified source code. This script can be used with our patched source. Currently available at http://download.mantidproject.org/VatesDownload.psp
3) The default ParaView packaging puts libraries in subdirectories of lib and they therefore cannot be found by Mantid without manually modifying the LD_LIBRARY_PATH. This packaging script will fix that issue.
1) We distribute a slightly modified source version of ParaView 3.98.1. This script can be used with our patched source.
Currently available at http://download.mantidproject.org
2) The default ParaView packaging puts libraries in subdirectories of lib and they therefore cannot be found by Mantid
without manually modifying the LD_LIBRARY_PATH. This packaging script will fix that issue.
Usage:
In order to build the binary packages. Place the *.tar.gz paraview source compressed file from http://download.mantidproject.org/VatesDownload.psp into an empty directory. Copy the accompanying *.sh script associated with this README into the same directory. Run the bash script. The packaged .*Deb binaries will appear in the /paraview/install directory at the end of the process.
- In order to build the binary packages. Place the *.tar.gz paraview source compressed file from
http://download.mantidproject.org into an empty directory.
- Copy the accompanying *.sh script associated with this README into the same directory. Run the bash script.
The packaged .*Deb binaries will appear in the /paraview/install directory at the end of the process.
......@@ -9,9 +9,9 @@ PV_LOC=paraview
PV_PKG=ParaView
PV_VER=3.10.1
PV_VER=3.98.1
PV_NAME=${PV_PKG}-${PV_VER}-patched
PV_NAME=${PV_PKG}-${PV_VER}-source
PV_SRC=${PV_NAME}.tar.gz
......
......@@ -232,44 +232,46 @@ public:
if (Poco::File(filepath).exists()) Poco::File(filepath).remove();
}
void xtestDownloaddataFile1()
{
std::string filepath=Kernel::ConfigService::Instance().getString("defaultsave.directory");
filepath += "download_time.txt";
std::ofstream ofs(filepath.c_str(), std::ios_base::out | std::ios_base::app);
if ( ofs.rdstate() & std::ios::failbit )
{
throw Mantid::Kernel::Exception::FileError("Error on creating File","download_time.txt");
}
CatalogDownloadDataFiles downloadobj1;
// As the algorithm now uses setProperty to allow us to save it to a directory we must pass in the default for testing.
std::string fName = Kernel::ConfigService::Instance().getString("defaultsave.directory");
// Need to initialize the algorithm in order to set the "downloadPath" property.
if ( !downloadobj1.isInitialized() ) downloadobj1.initialize();
downloadobj1.setPropertyValue("DownloadPath",fName);
clock_t start=clock();
std::string fullPathDownloadedFile = downloadobj1.testDownload("http://download.mantidproject.org/videos/Installation.htm","test.htm");
clock_t end=clock();
float diff = float(end -start)/CLOCKS_PER_SEC;
ofs<<"Time taken for http download from mantidwebserver over internet for a small file of size 1KB is "<<std::fixed << std::setprecision(2) << diff << " seconds" << std::endl;
//delete the file after execution
remove("test.htm");
// test if fullPathDownloadedFile ok
Poco::Path defaultSaveDir(Kernel::ConfigService::Instance().getString("defaultsave.directory"));
Poco::Path path(defaultSaveDir, "test.htm");
TS_ASSERT( fullPathDownloadedFile == path.toString() );
}
void xtestDownloaddataFile1()
{
std::string filepath=Kernel::ConfigService::Instance().getString("defaultsave.directory");
filepath += "download_time.txt";
std::ofstream ofs(filepath.c_str(), std::ios_base::out | std::ios_base::app);
if ( ofs.rdstate() & std::ios::failbit )
{
throw Mantid::Kernel::Exception::FileError("Error on creating File","download_time.txt");
}
CatalogDownloadDataFiles downloadobj1;
// As the algorithm now uses setProperty to allow us to save it to a directory we must pass in the default for testing.
std::string fName = Kernel::ConfigService::Instance().getString("defaultsave.directory");
// Need to initialize the algorithm in order to set the "downloadPath" property.
if ( !downloadobj1.isInitialized() ) downloadobj1.initialize();
downloadobj1.setPropertyValue("DownloadPath",fName);
clock_t start=clock();
// this gets the main doc page, which should always be there
// it's a wiki page so it can be relatively slow
std::string fullPathDownloadedFile = downloadobj1.testDownload("http://www.mantidproject.org/Documentation","test.htm");
clock_t end=clock();
float diff = float(end -start)/CLOCKS_PER_SEC;
ofs<<"Time taken for http download from mantidwebserver over internet for a small file of size 1KB is "<<std::fixed << std::setprecision(2) << diff << " seconds" << std::endl;
//delete the file after execution
remove("test.htm");
// test if fullPathDownloadedFile ok
Poco::Path defaultSaveDir(Kernel::ConfigService::Instance().getString("defaultsave.directory"));
Poco::Path path(defaultSaveDir, "test.htm");
TS_ASSERT( fullPathDownloadedFile == path.toString() );
}
private:
CatalogSearch searchobj;
CatalogGetDataFiles invstObj;
CatalogDownloadDataFiles downloadobj;
CatalogLogin loginobj;
CatalogSearch searchobj;
CatalogGetDataFiles invstObj;
CatalogDownloadDataFiles downloadobj;
CatalogLogin loginobj;
};
#endif
......@@ -183,7 +183,7 @@ UploaderWebServer = @MANTIDPUBLISHER@
# Local system path for the script repository.
ScriptLocalRepository =
# Url for the remote script repository.
ScriptRepository = http://download.mantidproject.org/scriptrepository/
ScriptRepository = https://github.com/mantidproject/scriptrepository
# Pattern given to ScriptRepository that is used to hide entries from repository to the users. It is a csv string separated with ';'
ScriptRepositoryIgnore = *pyc;
......
......@@ -6,7 +6,7 @@
.. properties::
.. _TableWorkspace Python API: http://download.mantidproject.org/docs/current-release/python/html/api/generated/ITableWorkspace.html
.. _TableWorkspace Python API: http://www.mantidproject.org/Python_ITableWorkspace_v2
Description
-----------
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment