summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjungwook.ryu <jungwook.ryu@samsung.com>2014-07-09 12:01:41 +0900
committerjungwook.ryu <jungwook.ryu@samsung.com>2014-07-09 12:03:08 +0900
commite7b734d0e430a4f1761539d75a3a73633ba0bf0b (patch)
treec4ed7d9764d2b6cf5a07d417b727b53af1d52658
parentac3736d714894055bc676b24e0b404ca963e7099 (diff)
parent8f56245fc8bb6cbebd332bf66d85fa4a71154c72 (diff)
downloaddynamic-analysis-ide-eplugin-e7b734d0e430a4f1761539d75a3a73633ba0bf0b.tar.gz
dynamic-analysis-ide-eplugin-e7b734d0e430a4f1761539d75a3a73633ba0bf0b.tar.bz2
dynamic-analysis-ide-eplugin-e7b734d0e430a4f1761539d75a3a73633ba0bf0b.zip
Merge remote-tracking branch 'origin/tizen' into mw
Change-Id: Ib028964259bb1fe2a11a9050e4814e08a3fec6f1 Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
-rw-r--r--org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/launch/TizenNativeApplicationDADelegate.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/launch/TizenNativeApplicationDADelegate.java b/org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/launch/TizenNativeApplicationDADelegate.java
index f2d44e2..765eba1 100644
--- a/org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/launch/TizenNativeApplicationDADelegate.java
+++ b/org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/launch/TizenNativeApplicationDADelegate.java
@@ -333,6 +333,10 @@ public class TizenNativeApplicationDADelegate extends
rdsDeployer.setIgnoreList(TizenLaunchInfo
.makeIgnoreList());
if (!rdsDeployer.deploy()) {
+ if (packager == null) {
+ bSuccessBuild = false;
+ return;
+ }
buildPackage(monitor, project,
manifest, packager);
normalDeploy(monitor, project,
@@ -341,6 +345,10 @@ public class TizenNativeApplicationDADelegate extends
}
rdsDeployer.pushResInfoFile();
} else {
+ if (packager == null) {
+ bSuccessBuild = false;
+ return;
+ }
buildPackage(monitor, project, manifest,
packager);
normalDeploy(monitor, project,
@@ -614,7 +622,9 @@ public class TizenNativeApplicationDADelegate extends
String rpmFolderPath = project.getFolder(getBuildConfiguration(project).getName()).getLocation().toOSString();
File rpmFolder = new File(rpmFolderPath);
File[] rpmList = rpmFolder.listFiles(new ExtFilter(PLATFORM_PKG_TYPE.toLowerCase()));
-
+ if (rpmList == null) {
+ return rpms;
+ }
for (int i = 0; i < rpmList.length; i++) {
rpms.add(rpmList[i].getAbsolutePath());
}