[ice] Ice 3.5b -- support files
mef
mef at fedoraproject.org
Tue Jan 29 13:37:06 UTC 2013
commit 1040f92bbabea4b7f9ca140ca1ceb20a51dd5358
Author: mef3 <mefoster at gmail.com>
Date: Fri Jan 25 11:27:48 2013 +0000
Ice 3.5b -- support files
.gitignore | 2 +
ice-3.5b-arm.patch | 13 ++
ice-3.5b-dont-build-demo-test.patch | 40 +++++++
ice-3.5b-libdb4.patch | 16 +++
ice-3.5b-remove-javafx.patch | 216 +++++++++++++++++++++++++++++++++++
ice-3.5b-s390.patch | 22 ++++
sources | 2 +-
7 files changed, 310 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc7f88f..6df56e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ Ice-3.3.0-man-pages.tbz
/ice-3.4.1-man-pages.tar.gz
/ice-3.4.2-man-pages.tar.gz
/Ice-3.4.2.tar.gz
+/Ice-3.5b
+/Ice-3.5b.tar.gz
diff --git a/ice-3.5b-arm.patch b/ice-3.5b-arm.patch
new file mode 100644
index 0000000..7ffff2e
--- /dev/null
+++ b/ice-3.5b-arm.patch
@@ -0,0 +1,13 @@
+diff -ur Ice-3.5b.orig/cpp/include/IceUtil/Config.h Ice-3.5b/cpp/include/IceUtil/Config.h
+--- Ice-3.5b.orig/cpp/include/IceUtil/Config.h 2012-12-12 21:15:12.000000000 +0000
++++ Ice-3.5b/cpp/include/IceUtil/Config.h 2012-12-17 11:19:48.907679223 +0000
+@@ -22,7 +22,7 @@
+
+ #if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || \
+ defined(_M_X64) || defined(_M_IA64) || defined(__alpha__) || \
+- defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
++ defined(__MIPSEL__) || defined(__arm__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
+ # define ICE_LITTLE_ENDIAN
+ #elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || \
+ defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
+Only in Ice-3.5b/cpp/include/IceUtil: .Config.h.swp
diff --git a/ice-3.5b-dont-build-demo-test.patch b/ice-3.5b-dont-build-demo-test.patch
new file mode 100644
index 0000000..350eb75
--- /dev/null
+++ b/ice-3.5b-dont-build-demo-test.patch
@@ -0,0 +1,40 @@
+diff -ur Ice-3.5b.orig/cpp/Makefile Ice-3.5b/cpp/Makefile
+--- Ice-3.5b.orig/cpp/Makefile 2012-12-12 21:15:11.000000000 +0000
++++ Ice-3.5b/cpp/Makefile 2012-12-17 10:05:50.071519692 +0000
+@@ -11,11 +11,7 @@
+
+ include $(top_srcdir)/config/Make.rules
+
+-SUBDIRS = config src include test
+-
+-ifeq ($(shell uname | grep MINGW),)
+-SUBDIRS := $(SUBDIRS) demo
+-endif
++SUBDIRS = config src include
+
+ INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
+
+diff -ur Ice-3.5b.orig/cs/Makefile Ice-3.5b/cs/Makefile
+--- Ice-3.5b.orig/cs/Makefile 2012-12-12 21:15:12.000000000 +0000
++++ Ice-3.5b/cs/Makefile 2012-12-17 10:05:54.274501425 +0000
+@@ -11,7 +11,7 @@
+
+ include $(top_srcdir)/config/Make.rules.cs
+
+-SUBDIRS = src test demo
++SUBDIRS = src
+
+ INSTALL_SUBDIRS = $(install_bindir) $(install_assembliesdir)
+
+diff -ur Ice-3.5b.orig/java/Makefile Ice-3.5b/java/Makefile
+--- Ice-3.5b.orig/java/Makefile 2012-12-12 21:15:12.000000000 +0000
++++ Ice-3.5b/java/Makefile 2012-12-17 10:47:47.258549099 +0000
+@@ -8,7 +8,7 @@
+ # **********************************************************************
+
+ all:
+- ant -emacs
++ ant -emacs dist-jar
+
+ clean:
+ ant -emacs clean
diff --git a/ice-3.5b-libdb4.patch b/ice-3.5b-libdb4.patch
new file mode 100644
index 0000000..b12df37
--- /dev/null
+++ b/ice-3.5b-libdb4.patch
@@ -0,0 +1,16 @@
+diff -ur Ice-3.5b.orig/cpp/config/Make.rules Ice-3.5b/cpp/config/Make.rules
+--- Ice-3.5b.orig/cpp/config/Make.rules 2012-12-12 21:15:13.000000000 +0000
++++ Ice-3.5b/cpp/config/Make.rules 2012-12-17 10:07:59.442983303 +0000
+@@ -219,9 +219,9 @@
+ endif
+ DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir))
+ else
+- ifeq ($(shell if [ -d /usr/include/db53 -a -d /usr/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
+- DB_FLAGS = -I/usr/include/db53
+- DB_LIBS = -L/usr/$(libsubdir)/db53 -ldb_cxx$(CPP11LIBSUFFIX)
++ ifeq ($(shell if [ -d /usr/include/libdb4 -a -d /usr/$(libsubdir)/libdb4 ] ; then echo yes; fi), yes)
++ DB_FLAGS = -I/usr/include/libdb4
++ DB_LIBS = -L/usr/$(libsubdir)/libdb4 -ldb_cxx$(CPP11LIBSUFFIX)
+ else
+ ifeq ($(shell if [ -d /usr/local/include/db53 -a -d /usr/local/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
+ DB_FLAGS = -I/usr/local/include/db53
diff --git a/ice-3.5b-remove-javafx.patch b/ice-3.5b-remove-javafx.patch
new file mode 100644
index 0000000..82a8b55
--- /dev/null
+++ b/ice-3.5b-remove-javafx.patch
@@ -0,0 +1,216 @@
+diff -ur Ice-3.5b.orig/java/src/IceGridGUI/Coordinator.java Ice-3.5b/java/src/IceGridGUI/Coordinator.java
+--- Ice-3.5b.orig/java/src/IceGridGUI/Coordinator.java 2012-12-12 21:15:12.000000000 +0000
++++ Ice-3.5b/java/src/IceGridGUI/Coordinator.java 2012-12-17 12:22:12.326433606 +0000
+@@ -56,7 +56,6 @@
+ import javax.naming.ldap.LdapName;
+ import javax.naming.ldap.Rdn;
+
+-import IceGridGUI.LiveDeployment.GraphView;
+
+ //
+ // This class coordinates the communications between the various objects
+@@ -342,7 +341,6 @@
+ // New Graph sub-menu
+ //
+ _newMenu.addSeparator();
+- _newMenu.add(_newGraph);
+
+ fileMenu.addSeparator();
+ fileMenu.add(_login);
+@@ -2602,22 +2600,6 @@
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+- if(_graphViews.size() > 0)
+- {
+- if(JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(getMainFrame(),
+- "Close all open Metrics Graph Views and logout?",
+- "Confirm logout",
+- JOptionPane.YES_NO_OPTION))
+- {
+- return;
+- }
+-
+- java.util.List<GraphView> views = new java.util.ArrayList<GraphView>(_graphViews);
+- for(GraphView v : views)
+- {
+- v.close();
+- }
+- }
+ _sessionKeeper.logout(true);
+ }
+ };
+@@ -2657,15 +2639,6 @@
+ "Release exclusive write access on the registry");
+ _releaseExclusiveWriteAccess.setEnabled(false);
+
+- _newGraph = new AbstractAction("Metrics Graph")
+- {
+- public void actionPerformed(ActionEvent e)
+- {
+- createGraphView();
+- }
+- };
+- _newGraph.setEnabled(false);
+-
+ _showLiveDeploymentFilters = new AbstractAction("Filter live deployment")
+ {
+ public void actionPerformed(ActionEvent e)
+@@ -3076,20 +3049,6 @@
+ _mainFrame.getContentPane().add(_mainPane, BorderLayout.CENTER);
+ }
+
+- public GraphView createGraphView()
+- {
+- StringBuilder title = new StringBuilder();
+- title.append("Metrics Graph");
+- if(_graphViews.size() > 0)
+- {
+- title.append(" - ");
+- title.append(Integer.toString(_graphViews.size()));
+- }
+- GraphView view = new GraphView(Coordinator.this, title.toString());
+- _graphViews.add(view);
+- return view;
+- }
+-
+ public LiveDeploymentPane getLiveDeploymentPane()
+ {
+ return _liveDeploymentPane;
+@@ -3204,23 +3163,6 @@
+
+ void exit(int status)
+ {
+- if(_graphViews.size() > 0)
+- {
+- if(JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(getMainFrame(),
+- "Close all open windows and exit?",
+- "Confirm exit",
+- JOptionPane.YES_NO_OPTION))
+- {
+- return;
+- }
+-
+- java.util.List<GraphView> views = new java.util.ArrayList<GraphView>(_graphViews);
+- for(GraphView v : views)
+- {
+- v.close();
+- }
+- }
+-
+ if(_openChooser != null)
+ {
+ File dir = _openChooser.getCurrentDirectory();
+@@ -3426,11 +3368,6 @@
+ _serviceMenu.setEnabled(false);
+ }
+
+- public void removeGraphView(GraphView view)
+- {
+- _graphViews.remove(view);
+- }
+-
+ public boolean traceObservers()
+ {
+ return _traceObservers;
+@@ -3455,7 +3392,6 @@
+ {
+ _connected = connected;
+ _statusBar.setConnected(connected);
+- _newGraph.setEnabled(connected);
+ }
+
+ public boolean connected()
+@@ -3526,11 +3462,6 @@
+ return _dataDir;
+ }
+
+- public GraphView[] getGraphViews()
+- {
+- return _graphViews.toArray(new GraphView[_graphViews.size()]);
+- }
+-
+ //
+ // May run in any thread
+ //
+@@ -3703,8 +3634,6 @@
+ private Action _acquireExclusiveWriteAccess;
+ private Action _releaseExclusiveWriteAccess;
+
+- private Action _newGraph;
+-
+ private Action _showLiveDeploymentFilters;
+ private Action _openApplicationFromFile;
+ private Action _openApplicationFromRegistry;
+@@ -3774,7 +3703,5 @@
+ private String _fileParser;
+ private boolean _connected;
+
+- private java.util.List<GraphView> _graphViews = new java.util.ArrayList<GraphView>();
+-
+ static private final int HISTORY_MAX_SIZE = 20;
+ }
+diff -ur Ice-3.5b.orig/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java Ice-3.5b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java
+--- Ice-3.5b.orig/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java 2012-12-12 21:15:12.000000000 +0000
++++ Ice-3.5b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java 2012-12-17 11:20:23.558547510 +0000
+@@ -701,60 +701,6 @@
+ table.addMouseListener(new ButtonMouseListener(table));
+ table.setAutoCreateRowSorter(true);
+ table.setTransferHandler(new TransferHandler(node));
+- table.addMouseListener(new MouseAdapter()
+- {
+- @Override
+- public void mousePressed(MouseEvent e)
+- {
+- createAndShowMenu(e);
+- }
+-
+- @Override
+- public void mouseReleased(MouseEvent e)
+- {
+- createAndShowMenu(e);
+- }
+-
+- public void createAndShowMenu(MouseEvent e)
+- {
+- if(e.isPopupTrigger())
+- {
+- JPopupMenu popup = new JPopupMenu();
+- JMenu addToGraph = new JMenu("Add To Metrics Graph");
+- popup.add(addToGraph);
+- final Map<String, List<MetricsCell>> rows = getSelectedRows(table, true);
+- addToGraph.setEnabled(rows.size() > 0);
+- JMenuItem newGraph = new JMenuItem("New Metrics Graph");
+- newGraph.addActionListener(new ActionListener()
+- {
+- public void actionPerformed(ActionEvent e)
+- {
+- GraphView view = node.getCoordinator().createGraphView();
+- view.addSeries(new MetricsViewTransferableData(new MetricsViewInfo(node),
+- entry.getKey(), rows));
+- }
+- });
+- addToGraph.add(newGraph);
+-
+- GraphView[] graphs = node.getCoordinator().getGraphViews();
+- for(final GraphView view : graphs)
+- {
+- JMenuItem item = new JMenuItem(view.getTitle());
+- addToGraph.add(item);
+- item.addActionListener(new ActionListener()
+- {
+- public void actionPerformed(ActionEvent e)
+- {
+- view.addSeries(new MetricsViewTransferableData(new MetricsViewInfo(node),
+- entry.getKey(), rows));
+- }
+- });
+- }
+- popup.show(e.getComponent(), e.getX(), e.getY());
+- }
+- }
+- });
+-
+ for(Map.Entry<Integer, MetricsField> fieldEntry : model.getMetricFields().entrySet())
+ {
+ if(fieldEntry.getValue().getCellRenderer() != null)
diff --git a/ice-3.5b-s390.patch b/ice-3.5b-s390.patch
new file mode 100644
index 0000000..383b7de
--- /dev/null
+++ b/ice-3.5b-s390.patch
@@ -0,0 +1,22 @@
+diff -ur Ice-3.5b.orig/cpp/include/IceUtil/Config.h Ice-3.5b/cpp/include/IceUtil/Config.h
+--- Ice-3.5b.orig/cpp/include/IceUtil/Config.h 2012-12-12 21:15:12.000000000 +0000
++++ Ice-3.5b/cpp/include/IceUtil/Config.h 2012-12-17 11:18:45.179923012 +0000
+@@ -26,7 +26,7 @@
+ # define ICE_LITTLE_ENDIAN
+ #elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || \
+ defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
+- defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
++ defined(__MIPSEB__) || defined(__s390__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
+ # define ICE_BIG_ENDIAN
+ #else
+ # error "Unknown architecture"
+@@ -36,7 +36,7 @@
+ // 32 or 64 bit mode?
+ //
+ #if defined(__sun) && (defined(__sparcv9) || defined(__x86_64)) || \
+- defined(__linux) && defined(__x86_64) || \
++ defined(__linux) && (defined(__x86_64) || defined(__s390x__)) || \
+ defined(__hppa) && defined(__LP64__) || \
+ defined(_ARCH_COM) && defined(__64BIT__) || \
+ defined(__alpha__) || \
+Only in Ice-3.5b/cpp/include/IceUtil: .Config.h.swp
diff --git a/sources b/sources
index 2fc64e2..520f700 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e97672eb4a63c6b8dd202d0773e19dc7 Ice-3.4.2.tar.gz
9de1981bdb81c6fc4c5d1c0fef73dd5b ice-3.4.2-man-pages.tar.gz
+957a29dcfadbc19443d1441f6f2beaf2 Ice-3.5b.tar.gz
More information about the scm-commits
mailing list