diff options
author | Lukas Larsson <[email protected]> | 2010-11-29 12:01:29 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2010-11-29 12:01:29 +0100 |
commit | bc651f186ca1bf0db0f9746db15672e302c80aaf (patch) | |
tree | 1b02d932aff59f2a639e91bf4452c00fa7a75962 /erts/etc/win32/Install.c | |
parent | 623c515a97516a262640dd0aae5a88cfaf179524 (diff) | |
parent | b0d50a05e3cebf92d484027407814103a0da6ea6 (diff) | |
download | otp-bc651f186ca1bf0db0f9746db15672e302c80aaf.tar.gz otp-bc651f186ca1bf0db0f9746db15672e302c80aaf.tar.bz2 otp-bc651f186ca1bf0db0f9746db15672e302c80aaf.zip |
Merge branch 'lukas/common_test/rename_run_test/OTP-8936' into dev
* lukas/common_test/rename_run_test/OTP-8936:
Update ct_run deprectaion warning to work properly on windows
Update documentation after rename of run_test to ct_run
Update make and install files to use ct_run instead of run_test and to keep a link to run_test available
Add deprication warning to run_test.c
Diffstat (limited to 'erts/etc/win32/Install.c')
-rw-r--r-- | erts/etc/win32/Install.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c index ca814e3f80..6e60512f6d 100644 --- a/erts/etc/win32/Install.c +++ b/erts/etc/win32/Install.c @@ -46,7 +46,7 @@ int main(int argc, char **argv) HANDLE module = GetModuleHandle(NULL); char *binaries[] = { "erl.exe", "werl.exe", "erlc.exe", "dialyzer.exe", "typer.exe", - "escript.exe", "run_test.exe", NULL }; + "escript.exe", "ct_run.exe", NULL }; char *scripts[] = { "start_clean.boot", "start_sasl.boot", NULL }; char fromname[MAX_PATH]; char toname[MAX_PATH]; @@ -172,6 +172,20 @@ int main(int argc, char **argv) } } + // Remove in R16B + sprintf(fromname,"%s\\%s",bin_dir,"ct_run.exe"); + sprintf(toname,"%s\\%s",bin_dir,"run_test.exe"); + if (GetFileAttributes(fromname) == 0xFFFFFFFF) { + fprintf(stderr,"Could not find file %s\n", + fromname); + exit(1); + } + if (!CopyFile(fromname,toname,FALSE)) { + fprintf(stderr,"Could not copy file %s to %s\n", + fromname,toname); + fprintf(stderr,"Continuing installation anyway...\n"); + } + for (i = 0; scripts[i] != NULL; ++i) { sprintf(fromname,"%s\\%s",release_dir,scripts[i]); sprintf(toname,"%s\\%s",bin_dir,scripts[i]); |