summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2015-04-20 11:15:04 -0230
committerMatthew Newhook <matthew@zeroc.com>2015-04-20 11:15:04 -0230
commitbf0b70be54239f969c58ea468dd45fba712dad4b (patch)
tree006dc77387836c2f84a01b4538f7d621ab4739c8 /cpp/src
parentFixed IceSSL OpenSSL implementation to provide and use the verified certifica... (diff)
downloadice-bf0b70be54239f969c58ea468dd45fba712dad4b.tar.bz2
ice-bf0b70be54239f969c58ea468dd45fba712dad4b.tar.xz
ice-bf0b70be54239f969c58ea468dd45fba712dad4b.zip
ICE-6455 - remove slice2py and slice2rb C++ exe
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Makefile5
-rw-r--r--cpp/src/Makefile.mak3
-rwxr-xr-xcpp/src/slice2py/.depend.mak12
-rw-r--r--cpp/src/slice2py/Main.cpp44
-rw-r--r--cpp/src/slice2py/Makefile30
-rw-r--r--cpp/src/slice2py/Makefile.mak46
-rw-r--r--cpp/src/slice2py/Slice2Py.rc34
-rwxr-xr-xcpp/src/slice2rb/.depend.mak12
-rw-r--r--cpp/src/slice2rb/Main.cpp44
-rw-r--r--cpp/src/slice2rb/Makefile30
-rw-r--r--cpp/src/slice2rb/Makefile.mak46
-rw-r--r--cpp/src/slice2rb/Slice2Rb.rc34
12 files changed, 1 insertions, 339 deletions
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index e99d90d50b5..6fd6a0be040 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -15,7 +15,6 @@ ifneq ($(findstring MINGW,$(UNAME)),)
SUBDIRS = IceUtil \
Slice \
slice2cpp \
- slice2rb \
Ice \
IceSSL \
IceDiscovery \
@@ -29,8 +28,6 @@ else
slice2freezej \
slice2java \
slice2php \
- slice2py \
- slice2rb \
slice2html \
slice2js
@@ -66,7 +63,7 @@ endif
Slice: IceUtil
-slice2cpp slice2cs slice2freeze slice2freezej slice2java slice2js slice2php slice2py slice2rb slice2html slice2objc: Slice
+slice2cpp slice2cs slice2freeze slice2freezej slice2java slice2js slice2php slice2html slice2objc: Slice
Ice: slice2cpp
diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak
index 9130f9a0243..5d3f4cc1f81 100644
--- a/cpp/src/Makefile.mak
+++ b/cpp/src/Makefile.mak
@@ -21,7 +21,6 @@ SUBDIRS = IceUtil\winrt \
SUBDIRS = IceUtil \
Slice \
slice2cpp \
- slice2py \
Ice \
IceSSL \
IceDiscovery \
@@ -34,10 +33,8 @@ SUBDIRS = IceUtil \
slice2cs \
slice2freezej \
slice2java \
- slice2py \
slice2html \
slice2php \
- slice2rb \
slice2js \
Ice \
IceSSL \
diff --git a/cpp/src/slice2py/.depend.mak b/cpp/src/slice2py/.depend.mak
deleted file mode 100755
index f3beb849c0f..00000000000
--- a/cpp/src/slice2py/.depend.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Main.obj: \
- Main.cpp \
- "$(includedir)\Slice\PythonUtil.h" \
- "$(includedir)\Slice\Parser.h" \
- "$(includedir)\IceUtil\Shared.h" \
- "$(includedir)\IceUtil\Config.h" \
- "$(includedir)\IceUtil\Atomic.h" \
- "$(includedir)\IceUtil\Handle.h" \
- "$(includedir)\IceUtil\Exception.h" \
- "$(includedir)\IceUtil\OutputUtil.h" \
- "$(includedir)\Slice\Util.h" \
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
deleted file mode 100644
index 749749ff1bd..00000000000
--- a/cpp/src/slice2py/Main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Slice/PythonUtil.h>
-#include <Slice/Util.h>
-
-using namespace std;
-using namespace Slice;
-using namespace Slice::Python;
-
-int
-main(int argc, char* argv[])
-{
- try
- {
- return Slice::Python::compile(argc, argv);
- }
- catch(const std::exception& ex)
- {
- getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
- return EXIT_FAILURE;
- }
- catch(const std::string& msg)
- {
- getErrorStream() << argv[0] << ": error:" << msg << endl;
- return EXIT_FAILURE;
- }
- catch(const char* msg)
- {
- getErrorStream() << argv[0] << ": error:" << msg << endl;
- return EXIT_FAILURE;
- }
- catch(...)
- {
- getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
- return EXIT_FAILURE;
- }
-}
diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile
deleted file mode 100644
index fdd58cf87c6..00000000000
--- a/cpp/src/slice2py/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ../..
-
-NAME = $(bindir)/slice2py
-
-TARGETS = $(NAME)
-
-OBJS = Main.o
-
-RPATH_DIR = $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS := -I. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
- rm -f $@
- $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
- $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
- $(call installdata,$(top_srcdir)/../man/man1/slice2py.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak
deleted file mode 100644
index 26f0247f146..00000000000
--- a/cpp/src/slice2py/Makefile.mak
+++ /dev/null
@@ -1,46 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..
-
-NAME = $(top_srcdir)\bin\slice2py.exe
-
-TARGETS = $(NAME)
-
-OBJS = .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE = Slice2Py.res
-
-$(NAME): $(OBJS) Slice2Py.res
- $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
- $(BASELIBS) $(RES_FILE)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-clean::
- del /q $(NAME:.exe=.*)
- del /q Slice2Py.res
-
-install:: all
- copy $(NAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
- copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc
deleted file mode 100644
index f53b13c973f..00000000000
--- a/cpp/src/slice2py/Slice2Py.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,0,0
- PRODUCTVERSION 3,6,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904e4"
- BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
- VALUE "FileDescription", "Slice To Python Translator\0"
- VALUE "FileVersion", "3.6.0\0"
- VALUE "InternalName", "slice2py\0"
- VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0"
- VALUE "OriginalFilename", "slice2py.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.6.0\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1252
- END
-END
diff --git a/cpp/src/slice2rb/.depend.mak b/cpp/src/slice2rb/.depend.mak
deleted file mode 100755
index c5effb949ef..00000000000
--- a/cpp/src/slice2rb/.depend.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Main.obj: \
- Main.cpp \
- "$(includedir)\Slice\RubyUtil.h" \
- "$(includedir)\Slice\Parser.h" \
- "$(includedir)\IceUtil\Shared.h" \
- "$(includedir)\IceUtil\Config.h" \
- "$(includedir)\IceUtil\Atomic.h" \
- "$(includedir)\IceUtil\Handle.h" \
- "$(includedir)\IceUtil\Exception.h" \
- "$(includedir)\IceUtil\OutputUtil.h" \
- "$(includedir)\Slice\Util.h" \
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
deleted file mode 100644
index 337e01044c2..00000000000
--- a/cpp/src/slice2rb/Main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Slice/RubyUtil.h>
-#include <Slice/Util.h>
-
-using namespace std;
-using namespace Slice;
-using namespace Slice::Ruby;
-
-int
-main(int argc, char* argv[])
-{
- try
- {
- return Slice::Ruby::compile(argc, argv);
- }
- catch(const std::exception& ex)
- {
- getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
- return EXIT_FAILURE;
- }
- catch(const std::string& msg)
- {
- getErrorStream() << argv[0] << ": error:" << msg << endl;
- return EXIT_FAILURE;
- }
- catch(const char* msg)
- {
- getErrorStream() << argv[0] << ": error:" << msg << endl;
- return EXIT_FAILURE;
- }
- catch(...)
- {
- getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
- return EXIT_FAILURE;
- }
-}
diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile
deleted file mode 100644
index 7728f3889e0..00000000000
--- a/cpp/src/slice2rb/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ../..
-
-NAME = $(bindir)/slice2rb$(EXE_EXT)
-
-TARGETS = $(NAME)
-
-OBJS = Main.o
-
-RPATH_DIR = $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS := -I. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
- rm -f $@
- $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
- $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
- $(call installdata,$(top_srcdir)/../man/man1/slice2rb.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak
deleted file mode 100644
index 1742e069e22..00000000000
--- a/cpp/src/slice2rb/Makefile.mak
+++ /dev/null
@@ -1,46 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..
-
-NAME = $(top_srcdir)\bin\slice2rb.exe
-
-TARGETS = $(NAME)
-
-OBJS = .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE = Slice2Rb.res
-
-$(NAME): $(OBJS) Slice2Rb.res
- $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
- $(BASELIBS) $(RES_FILE)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-clean::
- del /q $(NAME:.exe=.*)
- del /q Slice2Rb.res
-
-install:: all
- copy $(NAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
- copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc
deleted file mode 100644
index ee63b456aee..00000000000
--- a/cpp/src/slice2rb/Slice2Rb.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,0,0
- PRODUCTVERSION 3,6,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904e4"
- BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
- VALUE "FileDescription", "Slice To Ruby Translator\0"
- VALUE "FileVersion", "3.6.0\0"
- VALUE "InternalName", "slice2rb\0"
- VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0"
- VALUE "OriginalFilename", "slice2rb.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.6.0\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1252
- END
-END