summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordonghyuk.yang <donghyuk.yang@samsung.com>2014-08-24 14:23:05 +0900
committerTaeyoung Son <taeyoung2.son@samsung.com>2014-12-16 14:17:06 +0900
commit09bfc6937758305006c29975e5da226036c35208 (patch)
treee2b4e55651a30092e845600e38acda135c9a35a8
parentce873e36cbdd32f165ea840e748b3f4ab8662c23 (diff)
downloadnativeplatform-eplugin-09bfc6937758305006c29975e5da226036c35208.tar.gz
nativeplatform-eplugin-09bfc6937758305006c29975e5da226036c35208.tar.bz2
nativeplatform-eplugin-09bfc6937758305006c29975e5da226036c35208.zip
MISC: Applied egit version changes (3.2) and modified package dependencies
Egit is upgraded with kepler upgrading. So, egit api is changed and package dependency also is changed. Change-Id: Idcdcd80c1e03954f554f5a77c347c3dedfd065bb Signed-off-by: donghyuk.yang <donghyuk.yang@samsung.com>
-rw-r--r--org.tizen.nativeplatform/src/org/tizen/nativeplatform/git/GitCommander.java5
-rw-r--r--org.tizen.nativeplatform/src/org/tizen/nativeplatform/wizards/TizenPlatformProjectWizard.java7
-rw-r--r--package/pkginfo.manifest22
3 files changed, 18 insertions, 16 deletions
diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/git/GitCommander.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/git/GitCommander.java
index 4a8b965f..bc11e79a 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/git/GitCommander.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/git/GitCommander.java
@@ -63,7 +63,7 @@ import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryCache.FileKey;
-import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.util.FS;
import org.eclipse.ui.PlatformUI;
@@ -102,7 +102,7 @@ public class GitCommander {
URIish uri = new URIish(sshConn + GITPATH_DELIMITER2 + gitPath);
int timeout = 0;
- Repository db = new FileRepository(new File(PlatformFileUtil.getTmpDir()));
+ Repository db = FileRepositoryBuilder.create(new File(PlatformFileUtil.getTmpDir()));
listRemoteOp = new ListRemoteOperation(db, uri, timeout);
if (container != null) {
@@ -116,6 +116,7 @@ public class GitCommander {
listRemoteOp.run(null);
}
+
final Ref idHEAD = listRemoteOp.getRemoteRef(Constants.HEAD);
Ref head = null;
for (final Ref r : listRemoteOp.getRemoteRefs()) {
diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/wizards/TizenPlatformProjectWizard.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/wizards/TizenPlatformProjectWizard.java
index 15489f12..3343071b 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/wizards/TizenPlatformProjectWizard.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/wizards/TizenPlatformProjectWizard.java
@@ -27,6 +27,7 @@
package org.tizen.nativeplatform.wizards;
+import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
@@ -41,7 +42,8 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -163,8 +165,7 @@ public class TizenPlatformProjectWizard extends TizenProjectWizard {
result = super.performFinish();
try {
- FileRepository gitRepos = new FileRepository(newProject.getLocation().toString()
- + "/.git");
+ Repository gitRepos = FileRepositoryBuilder.create(new File(newProject.getLocation().toString() + "/.git"));
if (!gitRepos.getDirectory().exists()) {
gitRepos.create();
}
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index f8b51be5..f0847018 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,40 +1,40 @@
Version:2.1.96
Source:nativeplatform-eplugin
-Maintainer:Kangho Kim <kh5325.kim@samsung.com>, Yoonki Park<yoonki.park@samsung.com>, Hyunsik Noh<hyunsik.noh@samsung.com>, Gun Kim<gune.kim@samsung.com>, Ho Namkoong<ho.namkoong@samsung.com>, Taeyoung Son<taeyoung2.son@samsung.com>
+Maintainer:Donghee Yang <donghee.yang@samsung.com>, Donghyuk Yang<donghyuk.yang@samsung.com>, Jaemin Kim<jm.jaemin.kim@samsung.com>
Package:nativeplatform-eplugin
OS:ubuntu-32
Build-host-os:ubuntu-32
-Build-dependency:base-ide-product [ubuntu-32], base-ide-product-add-ons [ubuntu-32], pde-build [ubuntu-32], common-eplugin [ubuntu-32], nativecommon-eplugin [ubuntu-32], nativeappcommon-eplugin [ubuntu-32]
-Install-dependency:base-ide-product [ubuntu-32], base-ide-product-add-ons [ubuntu-32], common-eplugin [ubuntu-32], nativecommon-eplugin [ubuntu-32], nativeappcommon-eplugin [ubuntu-32]
+Build-dependency:pde-build [ubuntu-32], nativeappcommon-eplugin [ubuntu-32]
+Install-dependency:nativeappcommon-eplugin [ubuntu-32]
Description:Nativeplatform plugin
Package:nativeplatform-eplugin
OS:ubuntu-64
Build-host-os:ubuntu-64
-Build-dependency:base-ide-product [ubuntu-64], base-ide-product-add-ons [ubuntu-64], pde-build [ubuntu-64], common-eplugin [ubuntu-64], nativecommon-eplugin [ubuntu-64], nativeappcommon-eplugin [ubuntu-64]
-Install-dependency:base-ide-product [ubuntu-64], base-ide-product-add-ons [ubuntu-64], common-eplugin [ubuntu-64], nativecommon-eplugin [ubuntu-64], nativeappcommon-eplugin [ubuntu-64]
+Build-dependency:pde-build [ubuntu-64], nativeappcommon-eplugin [ubuntu-64]
+Install-dependency:nativeappcommon-eplugin [ubuntu-64]
Description:Nativeplatform plugin
Package:nativeplatform-eplugin
OS:windows-32
Build-host-os:ubuntu-64
-Build-dependency:base-ide-product [windows-32], base-ide-product-add-ons [windows-32], pde-build [windows-32], common-eplugin [windows-32], nativecommon-eplugin [windows-32], nativeappcommon-eplugin [windows-32]
-Install-dependency:base-ide-product [windows-32], base-ide-product-add-ons [windows-32], common-eplugin [windows-32], nativecommon-eplugin [windows-32], nativeappcommon-eplugin [windows-32]
+Build-dependency:pde-build [windows-32], nativeappcommon-eplugin [windows-32]
+Install-dependency:nativeappcommon-eplugin [windows-32]
Description:Nativeplatform plugin
Package:nativeplatform-eplugin
OS:windows-64
Build-host-os:ubuntu-64
-Build-dependency:base-ide-product [windows-64], base-ide-product-add-ons [windows-64], pde-build [windows-64], common-eplugin [windows-64], nativecommon-eplugin [windows-64], nativeappcommon-eplugin [windows-64]
-Install-dependency:base-ide-product [windows-64], base-ide-product-add-ons [windows-64], common-eplugin [windows-64], nativecommon-eplugin [windows-64], nativeappcommon-eplugin [windows-64]
+Build-dependency:pde-build [windows-64], nativeappcommon-eplugin [windows-64]
+Install-dependency:nativeappcommon-eplugin [windows-64]
Description:Nativeplatform plugin
Package:nativeplatform-eplugin
OS:macos-64
Build-host-os:ubuntu-32
-Build-dependency:base-ide-product [macos-64], base-ide-product-add-ons [macos-64], pde-build [macos-64], common-eplugin [macos-64], nativecommon-eplugin [macos-64], nativeappcommon-eplugin [macos-64]
-Install-dependency:base-ide-product [macos-64], base-ide-product-add-ons [macos-64], common-eplugin [macos-64], nativecommon-eplugin [macos-64], nativeappcommon-eplugin [macos-64]
+Build-dependency:pde-build [macos-64], nativeappcommon-eplugin [macos-64]
+Install-dependency:nativeappcommon-eplugin [macos-64]
Description:Nativeplatform plugin
Package:nativeplatform-eplugin-test