Split unix/windows code into seperate files to preserve sanity.
Originally committed to SVN as r4343.
This commit is contained in:
parent
810ffa09c7
commit
ad005c3a9c
5 changed files with 67 additions and 12 deletions
|
@ -9,6 +9,7 @@ run_CPPFLAGS= -I../src/include -I../libaegisub/include
|
|||
run_SOURCES = \
|
||||
main.cpp \
|
||||
util.cpp \
|
||||
util_unix.cpp \
|
||||
libaegisub_access.cpp \
|
||||
libaegisub_cajun.cpp \
|
||||
libaegisub_util.cpp \
|
||||
|
|
|
@ -16,16 +16,10 @@
|
|||
|
||||
/// @file util.cpp
|
||||
/// @brief Common utilities used in tests.
|
||||
/// @ingroup util
|
||||
/// @ingroup util common
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <io.h>
|
||||
#define UNLINK _unlink
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#define UNLINK unlink
|
||||
#endif
|
||||
#include <fstream>
|
||||
#include "util.h"
|
||||
|
||||
namespace util {
|
||||
|
||||
|
@ -36,10 +30,6 @@ void copy(const std::string from, const std::string to) {
|
|||
ofs << ifs.rdbuf();
|
||||
}
|
||||
|
||||
void remove(const std::string& file) {
|
||||
UNLINK(file.c_str());
|
||||
}
|
||||
|
||||
} // namespace util
|
||||
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
/// @brief Common utilities used in tests.
|
||||
/// @ingroup util
|
||||
|
||||
#include <string>
|
||||
namespace util {
|
||||
|
||||
void copy(const std::string from, const std::string to);
|
||||
|
|
31
aegisub/tests/util_unix.cpp
Normal file
31
aegisub/tests/util_unix.cpp
Normal file
|
@ -0,0 +1,31 @@
|
|||
// Copyright (c) 2010, Amar Takhar <verm@aegisub.org>
|
||||
//
|
||||
// Permission to use, copy, modify, and distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
//
|
||||
// $Id$
|
||||
|
||||
/// @file util_unix.cpp
|
||||
/// @brief Common utilities used in tests.
|
||||
/// @ingroup util unix
|
||||
|
||||
#include <unistd.h>
|
||||
#include "util.h"
|
||||
|
||||
namespace util {
|
||||
|
||||
void remove(const std::string& file) {
|
||||
unlink(file.c_str());
|
||||
}
|
||||
|
||||
} // namespace util
|
||||
|
32
aegisub/tests/util_windows.cpp
Normal file
32
aegisub/tests/util_windows.cpp
Normal file
|
@ -0,0 +1,32 @@
|
|||
// Copyright (c) 2010, Amar Takhar <verm@aegisub.org>
|
||||
//
|
||||
// Permission to use, copy, modify, and distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
//
|
||||
// $Id$
|
||||
|
||||
/// @file util_windows.cpp
|
||||
/// @brief Common utilities used in tests.
|
||||
/// @ingroup util windows
|
||||
|
||||
#include <io.h>
|
||||
#include "util.sh"
|
||||
|
||||
namespace util {
|
||||
|
||||
void remove(const std::string& file) {
|
||||
_unlink(file.c_str());
|
||||
}
|
||||
|
||||
} // namespace util
|
||||
|
||||
|
Loading…
Reference in a new issue