github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-10 06:12:29 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.android_builder fix issue with moveing file into android project

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8637 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2015-07-06 21:03:22 +00:00
parent 264ae6ef62
commit 2dfcea4e06
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uppsrc/ide/Builders/AndroidBuilder.icpp
View file

@ -371,17 +371,18 @@ void AndroidBuilder::CleanPackage(const String& package)
DeleteFolderDeep(sandboxDir);
}
bool AndroidBuilder::MovePackageFileToAndroidProject(const String& src, const String& dest)
bool AndroidBuilder::MovePackageFileToAndroidProject(const String& src, const String& dst)
{
if(!RealizeDirectory(GetFileDirectory(dest)))
if(!RealizeDirectory(GetFileDirectory(dst)))
return false;
if(FileExists(dest)) {
if(GetFileTime(src).Get() <= GetFileTime(dest).Get())
if(FileExists(dst)) {
if(GetFileTime(dst) > GetFileTime(src))
return true;
}
SaveFile(dst, LoadFile(src));
return FileCopy(src, dest);
return true;
}
bool AndroidBuilder::RealizePackageSourcesDirectory(const String& packageName)

5
uppsrc/ide/Builders/init
View file

@ -1,6 +1,8 @@
#ifndef _ide_Builders_icpp_init_stub
#define _ide_Builders_icpp_init_stub
#include "ide\Core/init"
#include "ide/Android/init"
#include "ide/Java/init"
#define BLITZ_INDEX__ Fab5aa4644e1c1b5af8ed5faf2d4db317
#include "GccBuilder.icpp"
#undef BLITZ_INDEX__
@ -13,6 +15,9 @@
#define BLITZ_INDEX__ Fecf66fc39eec6a21e32d6c41cad4d431
#include "JavaBuilder.icpp"
#undef BLITZ_INDEX__
#define BLITZ_INDEX__ Fea8152e4f0407437ab942dc131a5c47f
#include "AndroidBuilder.icpp"
#undef BLITZ_INDEX__
#define BLITZ_INDEX__ Fa99182ca8dccb6e49a9bb75dbfd7c33d
#include "ScriptBuilder.icpp"
#undef BLITZ_INDEX__