diff options
| -rw-r--r-- | MSVC_NMake/filelist.am | 1 | ||||
| -rw-r--r-- | MSVC_NMake/gendef/gendef.cc | 104 | ||||
| -rw-r--r-- | MSVC_NMake/gendef/meson.build | 9 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | meson.build | 1 |
5 files changed, 0 insertions, 116 deletions
diff --git a/MSVC_NMake/filelist.am b/MSVC_NMake/filelist.am index 51cd3147..c450c502 100644 --- a/MSVC_NMake/filelist.am +++ b/MSVC_NMake/filelist.am @@ -6,7 +6,6 @@ msvc_nmake_data = \ create-lists.bat \ create-lists-msvc.mak \ detectenv-msvc.mak \ - gendef/gendef.cc \ generate-msvc.mak \ glibmm/glibmmconfig.h \ glibmm/glibmm.rc \ diff --git a/MSVC_NMake/gendef/gendef.cc b/MSVC_NMake/gendef/gendef.cc deleted file mode 100644 index d18ac9fb..00000000 --- a/MSVC_NMake/gendef/gendef.cc +++ /dev/null @@ -1,104 +0,0 @@ -/* - * MICO --- an Open Source CORBA implementation - * Copyright (c) 2003 Harald Böhme - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * For more information, visit the MICO Home Page at - * http://www.mico.org/ - */ - -/* Modified by Cedric Gustin <cedric.gustin@gmail.com> on 2006/01/13 : - * Redirect the output of dumpbin to dumpbin.out instead of reading the - * output stream of popen, as it fails with Visual Studio 2005 in - * pre-link build events. - */ - -#include <fstream> -#include <iostream> -#include <stdio.h> - -using namespace std; - -int -main(int argc, char** argv) -{ - if (argc < 4) - { - cerr << "Usage: " << argv[0] << " <def-file-name> <dll-base-name> <obj-file> ...." << endl; - return 2; - } - - // CG : Explicitly redirect stdout to dumpbin.out. - string dumpbin = "dumpbin /SYMBOLS /OUT:dumpbin.out"; - int i = 3; - - for (; i < argc;) - { - dumpbin += " "; - dumpbin += argv[i++]; - } - - FILE* dump; - - if ((dump = _popen(dumpbin.c_str(), "r")) == NULL) - { - cerr << "could not popen dumpbin" << endl; - return 3; - } - - // CG : Wait for the dumpbin process to finish and open dumpbin.out. - _pclose(dump); - dump = fopen("dumpbin.out", "r"); - - ofstream def_file(argv[1]); - - def_file << "LIBRARY " << argv[2] << endl; - def_file << "EXPORTS" << endl; - - i = 0; - while (!feof(dump)) - { - char buf[65000]; - - if (fgets(buf, 64999, dump) != NULL) - { - if (!strstr(buf, " UNDEF ") && strstr(buf, " External ")) - { - char* s = strchr(buf, '|') + 1; - while (*s == ' ' || *s == '\t') - s++; - char* e = s; - while (*e != ' ' && *e != '\t' && *e != '\0' && *e != '\n') - e++; - *e = '\0'; - - if (strchr(s, '?') == 0 && s[0] == '_' && - strchr(s, '@') == 0) // this is a C export type: _fct -> fct - def_file << " " << (s + 1) << endl; - else if (strchr(s, '?') != 0 && strncmp(s, "??_G", 4) != 0 && strncmp(s, "??_E", 4) != 0) - { - def_file << " " << s << endl; - } - } - } - } - - // CG : Close dumpbin.out and delete it. - fclose(dump); - remove("dumpbin.out"); - - cout << dumpbin.c_str() << endl; -} diff --git a/MSVC_NMake/gendef/meson.build b/MSVC_NMake/gendef/meson.build deleted file mode 100644 index 5dce0ed6..00000000 --- a/MSVC_NMake/gendef/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -# MSVC_NMake/gendef - -# Input: is_msvc -# Output: gendef - -# Used to generate the .def file required to obtain the import .lib file -if is_msvc - gendef = executable('gendef', 'gendef.cc', cpp_args: '/wd4828', install: false) -endif diff --git a/Makefile.am b/Makefile.am index 5d36aafd..902243e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,7 +57,6 @@ DISTCLEANFILES = $(filter %mmconfig.h,$(msvc_files)) EXTRA_DIST = \ meson.build \ meson_options.txt \ - MSVC_NMake/gendef/meson.build \ MSVC_NMake/giomm/meson.build \ MSVC_NMake/glibmm/meson.build \ docs/reference/meson.build \ diff --git a/meson.build b/meson.build index 2636e563..dfea7496 100644 --- a/meson.build +++ b/meson.build @@ -195,7 +195,6 @@ if is_msvc endif subdir('tools') -subdir('MSVC_NMake/gendef') subdir('glib') subdir('MSVC_NMake/glibmm') subdir('glib/glibmm') |