rpms/eclipse-photran/devel makesource.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 eclipse-photran.spec, 1.2, 1.3 sources, 1.2, 1.3

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23885

Modified Files:
	.cvsignore eclipse-photran.spec sources 
Added Files:
	makesource.sh 
Log Message:
* Thu Aug 28 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.1
- 4.0.0 Beta 4
- Update for building against Eclipse SDK 3.4
- Move everything to %{_libdir}



--- NEW FILE makesource.sh ---
#!/bin/sh

rel=v20080808_4_0_0_Beta4
rm -rf org.eclipse.photran-$rel
cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -r $rel -d org.eclipse.photran-$rel org.eclipse.photran

#Cleanup deprecated stuff
pushd org.eclipse.photran-$rel
for deprecated in */THIS_*_DEPRECATED
do
  rm -rf `dirname $deprecated`
done
popd

tar czf org.eclipse.photran-$rel.tar.gz org.eclipse.photran-$rel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Dec 2007 23:19:47 -0000	1.2
+++ .cvsignore	28 Aug 2008 20:22:05 -0000	1.3
@@ -1 +1 @@
-org.eclipse.photran.tar.gz
+org.eclipse.photran-v20080808_4_0_0_Beta4.tar.gz


Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-photran.spec	19 Feb 2008 17:02:43 -0000	1.2
+++ eclipse-photran.spec	28 Aug 2008 20:22:05 -0000	1.3
@@ -1,33 +1,22 @@
 %define gcj_support             1
 %define major                   4
 %define minor                   0       
+%define patch                   0       
 %define majmin                  %{major}.%{minor}
-%define eclipse_base            %{_datadir}/eclipse
-%define eclipse_lib_base        %{_libdir}/eclipse
-
-# All arches line up except i386 -> x86
-%ifarch %{ix86}
-%define eclipse_arch    x86
-%else
-%define eclipse_arch   %{_arch}
-%endif
+%define eclipse_base            %{_libdir}/eclipse
 
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
-Version:        %{majmin}
-Release:        1.b3%{?dist}.1
+Version:        %{majmin}.%{patch}
+Release:        0.b4%{?dist}.1
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/photran
 Requires:       eclipse-platform
 
-# The following tarball was generated like this:
-#
-# cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -r v20071108_4_0_0_Beta3 org.eclipse.photran
-# rm -rf org.eclipse.photran/*.analysis org.eclipse.photran/*.debug.* org.eclipse.photran/*.launch org.eclipse.photran/*.refactoring* org.eclipse.photran/org.eclipse.photran.intel-feature org.eclipse.photran/org.eclipse.photran.vpg-feature
-# tar czf org.eclipse.photran.tar.gz org.eclipse.photran
-#
-Source0: org.eclipse.photran.tar.gz
+# The following tarball was generated by the makesource.sh script
+Source0: org.eclipse.photran-v20080808_4_0_0_Beta4.tar.gz
+Source1: makesource.sh
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-cdt >= 4.0.1
 %if %{gcj_support}
@@ -57,7 +46,7 @@
 
 
 %prep
-%setup -q -n org.eclipse.photran
+%setup -q -n org.eclipse.photran-v20080808_4_0_0_Beta4
 # Fixup to use 1.5 source level
 find -name \*.prefs | xargs sed -i -e 's/source=1.3/source=1.5/'
 
@@ -65,43 +54,23 @@
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
-
-# See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} cdt
-SDK=$(cd SDK >/dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-java -cp $SDK/startup.jar \
-        -Dosgi.sharedConfiguration.area=%{eclipse_lib_base}/configuration                        \
-        -Duser.home=$homedir                        \
-        org.eclipse.core.launcher.Main             \
-        -application org.eclipse.ant.core.antRunner       \
-        -Dtype=feature                                    \
-        -Did=org.eclipse.photran_feature                  \
-        -DsourceDirectory=$(pwd)                          \
-        -DbuildDirectory=$(pwd)/build                     \
-        -DbaseLocation=$SDK                               \
-        -DjavacSource=1.5 \
-        -DjavacTarget=1.5 \
-        -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
-        -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml 
+for feature in org.eclipse.photran_feature org.eclipse.photran.vpg_feature \
+               org.eclipse.photran.xlf_feature
+do
+  %{eclipse_base}/buildscripts/pdebuild -d cdt \
+    -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
+done
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
-
-unzip -d ${RPM_BUILD_ROOT}/%{_datadir} build/rpmBuild/org.eclipse.photran_feature.zip
-
-# We move arch-specific plugins to libdir.
-mkdir -p ${RPM_BUILD_ROOT}%{eclipse_lib_base}/plugins
-for archplugin in $(find ${RPM_BUILD_ROOT}%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{version}\*); do
-  mv $archplugin ${RPM_BUILD_ROOT}%{eclipse_lib_base}/plugins
-  chmod -R 755 ${RPM_BUILD_ROOT}%{eclipse_lib_base}/plugins/$(basename $archplugin)
+for feature in photran photran.vpg photran.xlf
+do
+  install -d -m755 ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}
+  
+  unzip -o -d ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature} \
+              build/rpmBuild/org.eclipse.${feature}_feature.zip
 done
 
 %if %{gcj_support}
@@ -123,13 +92,18 @@
 %files
 %defattr(-,root,root)
 %doc org.eclipse.photran-feature/epl-v10.html
-%{eclipse_base}/plugins/*
+%{eclipse_base}/dropins/*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 
 %changelog
+* Thu Aug 28 2008 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-0.b4.1
+- 4.0.0 Beta 4
+- Update for building against Eclipse SDK 3.4
+- Move everything to %%{_libdir}
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.0-1.b3.1
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Dec 2007 23:19:47 -0000	1.2
+++ sources	28 Aug 2008 20:22:06 -0000	1.3
@@ -1 +1 @@
-9896b5eb0cff94412e1a61cd691055f0  org.eclipse.photran.tar.gz
+55701c38f6bd399b76fd574d3b50b75e  org.eclipse.photran-v20080808_4_0_0_Beta4.tar.gz