[SCM] master: Generate a build/eclipse project directory; cite in build notes.

cagney@sourceware.org cagney@sourceware.org
Fri Dec 14 16:31:00 GMT 2007


The branch, master has been updated
       via  dec0936bd54221500923d04bd25ea6520ec5917e (commit)
       via  1eaea074ac2ced0735b91d8ef6f488c64c7555f1 (commit)
      from  59372184fa6dc225a01068158bd3cc02ee22cca9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit dec0936bd54221500923d04bd25ea6520ec5917e
Author: Andrew Cagney <cagney@redhat.com>
Date:   Fri Dec 14 11:31:26 2007 -0500

    Generate a build/eclipse project directory; cite in build notes.
    
    2007-12-14  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.am (eclipse/.project): New.
    	* Makefile.am (eclipse/.classpath): New.
    	* .classpath.in: New.
    	* .project.in: New.

commit 1eaea074ac2ced0735b91d8ef6f488c64c7555f1
Author: Andrew Cagney <cagney@redhat.com>
Date:   Fri Dec 14 09:51:57 2007 -0500

    Include Makefile.rules into top-level Makefile.am.
    
    2007-12-14  Andrew Cagney  <cagney@redhat.com>
    
    	* configure.ac: m4_include common/frysk-common.ac.
    	(AM_PROG_GCJ): Delete call.
    	* Makefile.am: Include common/Makefile.rules.
    	(empty): Delete.
    	(space): Delete.
    	(ACLOCAL_AMFLAGS): Delete.

-----------------------------------------------------------------------

Summary of changes:
 .classpath.in           |    1 +
 .gitignore              |    2 ++
 .project.in             |    1 +
 frysk-top/.classpath.in |   29 +++++++++++++++++++++++++++++
 frysk-top/.project.in   |   40 ++++++++++++++++++++++++++++++++++++++++
 frysk-top/ChangeLog     |   14 ++++++++++++++
 frysk-top/Makefile.am   |   21 ++++++++++++++-------
 frysk-top/configure.ac  |    4 ++--
 htdocs/build/index.html |   17 +++++++++++------
 9 files changed, 114 insertions(+), 15 deletions(-)
 create mode 120000 .classpath.in
 create mode 120000 .project.in
 create mode 100644 frysk-top/.classpath.in
 create mode 100644 frysk-top/.project.in

First 500 lines of diff:
diff --git a/.classpath.in b/.classpath.in
new file mode 120000
index 0000000..dbf4167
--- /dev/null
+++ b/.classpath.in
@@ -0,0 +1 @@
+frysk-top/.classpath.in
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index db54151..34c4dc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@ install-sh
 missing
 compile
 depcomp
+config.guess
+config.sub
 *~
diff --git a/.project.in b/.project.in
new file mode 120000
index 0000000..55d6e30
--- /dev/null
+++ b/.project.in
@@ -0,0 +1 @@
+frysk-top/.project.in
\ No newline at end of file
diff --git a/frysk-top/.classpath.in b/frysk-top/.classpath.in
new file mode 100644
index 0000000..c88e218
--- /dev/null
+++ b/frysk-top/.classpath.in
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="src" path="frysk-gui"
+			exclude="configure.in"/>
+        <classpathentry kind="src" path="frysk-gtk"
+			exclude="configure.in"/>
+        <classpathentry kind="src" path="frysk-core"
+			exclude="configure.in"/>
+        <classpathentry kind="src" path="frysk-sys"
+			exclude="configure.in"/>
+        <classpathentry kind="lib" path="@abs_builddir@/frysk-gui/frysk-gui.jar"
+			sourcepath="@abs_builddir@/frysk-gui"/>
+        <classpathentry kind="lib" path="@abs_builddir@/frysk-gtk/frysk-gtk.jar"
+			sourcepath="@abs_builddir@/frysk-gtk"/>
+        <classpathentry kind="lib" path="@abs_builddir@/frysk-core/frysk-core.jar"
+			sourcepath="@abs_builddir@/frysk-core"/>
+        <classpathentry kind="lib" path="@abs_builddir@/frysk-sys/frysk-sys.jar"
+			sourcepath="@abs_builddir@/frysk-sys"/>
+	<classpathentry kind="lib" path="/usr/share/java/glade2.12.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/glib0.2.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/gtk2.8.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/cairo1.0.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/vte0.12.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/jdom.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
+ 
diff --git a/frysk-top/.project.in b/frysk-top/.project.in
new file mode 100644
index 0000000..c5eb182
--- /dev/null
+++ b/frysk-top/.project.in
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>my project</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>frysk-sys</name>
+			<type>2</type>
+			<location>@abs_srcdir@/frysk-sys</location>
+		</link>
+		<link>
+			<name>frysk-core</name>
+			<type>2</type>
+			<location>@abs_srcdir@/frysk-core</location>
+		</link>
+		<link>
+			<name>frysk-gtk</name>
+			<type>2</type>
+			<location>@abs_srcdir@/frysk-gtk</location>
+		</link>
+		<link>
+			<name>frysk-gui</name>
+			<type>2</type>
+			<location>@abs_srcdir@/frysk-gui</location>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/frysk-top/ChangeLog b/frysk-top/ChangeLog
index e7e213d..aabcdac 100644
--- a/frysk-top/ChangeLog
+++ b/frysk-top/ChangeLog
@@ -1,3 +1,17 @@
+2007-12-14  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.am (eclipse/.project): New.
+	* Makefile.am (eclipse/.classpath): New.
+	* .classpath.in: New.
+	* .project.in: New.
+
+	* configure.ac: m4_include common/frysk-common.ac.
+	(AM_PROG_GCJ): Delete call.
+	* Makefile.am: Include common/Makefile.rules.
+	(empty): Delete.
+	(space): Delete.
+	(ACLOCAL_AMFLAGS): Delete.
+
 2007-07-17  Andrew Cagney  <cagney@redhat.com>
 
 	Move CNI code from frysk-imports/ to frysk-sys/
diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am
index f910fe5..62ffe86 100644
--- a/frysk-top/Makefile.am
+++ b/frysk-top/Makefile.am
@@ -37,7 +37,9 @@
 # version and license this file solely under the GPL without
 # exception.
 
-CLEANFILES =
+
+include common/Makefile.rules
+
 
 SUBDIRS = \
 	frysk-imports \
@@ -46,12 +48,6 @@ SUBDIRS = \
 	frysk-gtk \
 	frysk-gui
 
-empty=
-space=$(empty) $(empty)
-
-# Find local macros.
-ACLOCAL_AMFLAGS = -I common/m4
-
 # Note the dir/. is needed, causes the file copy to put the contents
 # into the top level directory.
 
@@ -172,3 +168,14 @@ $(DOXYFILE): Doxyfile.in
 		< $< > $@.tmp
 	mv $@.tmp $@
 CLEANFILES += doxygen
+
+BUILT_SOURCES += .project
+eclipse/.project: .project.in
+	mkdir -p `dirname $@`
+	$(SUBST)
+	chmod u+w $@
+BUILT_SOURCES += .classpath
+eclipse/.classpath: .classpath.in
+	mkdir -p `dirname $@`
+	$(SUBST)
+	chmod u+w $@
diff --git a/frysk-top/configure.ac b/frysk-top/configure.ac
index 5f693c3..6e1d234 100644
--- a/frysk-top/configure.ac
+++ b/frysk-top/configure.ac
@@ -1,6 +1,6 @@
 # This file is part of the program FRYSK.
 #
-# Copyright 2005, Red Hat Inc.
+# Copyright 2005, 2007, Red Hat Inc.
 #
 # FRYSK is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -41,11 +41,11 @@ AC_PREREQ(2.59)
 
 sinclude(common/version.ac)
 AC_INIT(frysk,defn([FRYSK_VERSION]))
+m4_include([common/frysk-common.ac])
 
 AM_INIT_AUTOMAKE([subdir-objects foreign no-installinfo no-exeext no-dist])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_SUBDIRS([frysk-imports frysk-sys frysk-core frysk-gtk frysk-gui])
-AM_PROG_GCJ
 
 # Need to call PKG_CHECK_MODULES to get PKG_CONFIG set; used by javadoc.
 PKG_CHECK_MODULES(FRYSK_GNOME, [gtk+-2.0 >= 2.7.0 gtk2-java >= 2.7.0 
diff --git a/htdocs/build/index.html b/htdocs/build/index.html
index 994ba4d..138094a 100644
--- a/htdocs/build/index.html
+++ b/htdocs/build/index.html
@@ -354,26 +354,31 @@ suppression will take place.</dd>
 
 <dl>
 
-<dt>How to I edit files using eclipse?</dt>
+<dt>How do I "import" frysk into eclipse?</dt>
 
 <dd>
+First you will need to check out and build frysk from the command
+line.  This will create a build/eclipse directory containing the
+project file.  With the finished build.
 <ul>
 <li>Check eclipse-jdt is installed
-<li>Select: File -> New -> Project; to bring up the New Project window
-<li>Select: Java + Java Project
-<li>Edit: Create project from existing source; entering the root of a fresh GIT tree
-<li>Click finish
+<li>Start eclipse
+<li>Select: File -> Import ...; to bring up the Import window
+<li>Select: General + Existing Project Into Workspace; and click next
+<li>Fill in: Select root directory; with the path to the <tt><em>build</em>/eclipse</tt> directory.
+<li>Click: Finish
 </ul>
 </dd>
 
 <dt>What should my eclipse format options be set to?</dt>
 <dd>
+To set the format options globally to "Java" use:
 <ul>
 <li>Select: Window -> Preferences ...
 <li>Select: Java + Code Style + Formater
 <li>Change: Active Profile; to Java Conventions
 <li>Apply
-<li>
+</ul>
 
 </dd>
 


hooks/post-receive
--
frysk system monitor/debugger



More information about the Frysk-cvs mailing list