Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-01-05 10:42:28 +0000
committerAlexander Kurtakov2018-01-05 12:34:30 +0000
commit4720ffde2d239018671dc005d14eaa199c48b9d9 (patch)
tree931a4f579791147962d0d3803eee7f014468c9c7 /bundles/org.eclipse.swt/buildSWT.xml
parent53c1114e788cc8881f72017ee469a242b668764d (diff)
downloadeclipse.platform.swt-4720ffde2d239018671dc005d14eaa199c48b9d9.tar.gz
eclipse.platform.swt-4720ffde2d239018671dc005d14eaa199c48b9d9.tar.xz
eclipse.platform.swt-4720ffde2d239018671dc005d14eaa199c48b9d9.zip
Bug 529446 - Move Library.java to common from common_j2se
Tweaked .classpath files and Ant build files to handle the changed directory structure. Change-Id: I2160040e10eb8126b1a472cf9c96be0871b709c7 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/buildSWT.xml')
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 27888fc904..bbede00842 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2009, 2016 IBM Corporation and others.
+ Copyright (c) 2009, 2018 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -41,7 +41,7 @@
<property name="src_win32" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library'"/>
<property name="src_gtk" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library' 'bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library' "/>
<property name="src_cocoa" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library'"/>
- <property name="file_library_j2se" value="bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java"/>
+ <property name="file_library" value="bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java"/>
<property name="file_make_common" value="bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/>
<property name="file_version" value="bundles/org.eclipse.swt/Eclipse SWT/common/version.txt"/>
<property name="file_src_pom" value="bundles/org.eclipse.swt/pom.xml"/>
@@ -352,7 +352,7 @@
<target name="commit_sources" depends="get_version" if="natives_changed">
<exec dir="${repo.src}" executable="git" failonerror="true">
- <arg line="add '${file_library_j2se}' '${file_version}' '${file_make_common}' "/>
+ <arg line="add '${file_library}' '${file_version}' '${file_make_common}' "/>
</exec>
<exec dir="${repo.src}" executable="git" failonerror="true">
<arg line="status"/>
@@ -372,8 +372,8 @@
<target name="increment_version_impl">
<echo>Incrementing version from ${swt_version} to ${new_version}...</echo>
- <replace file="${repo.src}/${file_library_j2se}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/>
- <replace file="${repo.src}/${file_library_j2se}" token="MINOR_VERSION = ${min_ver}" value="MINOR_VERSION = ${new_min_ver}"/>
+ <replace file="${repo.src}/${file_library}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/>
+ <replace file="${repo.src}/${file_library}" token="MINOR_VERSION = ${min_ver}" value="MINOR_VERSION = ${new_min_ver}"/>
<replace file="${repo.src}/${file_version}" token="version ${maj_ver}.${min_ver}" value="version ${new_maj_ver}.${new_min_ver}"/>
<replace file="${repo.src}/${file_make_common}" token="min_ver=${min_ver}" value="min_ver=${new_min_ver}"/>
<replace file="${repo.src}/${file_make_common}" token="maj_ver=${maj_ver}" value="maj_ver=${new_maj_ver}"/>

Back to the top