Changes from releases/0.9.5 at r1588 to releases/0.9.6 at r1588
- Location:
- releases/0.9.6
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
releases/0.9.6/Dip
- Property svn:mergeinfo changed
/trunk/Dip merged: 915
- Property svn:mergeinfo changed
-
releases/0.9.6/Dip/configure
r1588 r1588 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.59 for Dip 0.9. 5.3 # Generated by GNU Autoconf 2.59 for Dip 0.9.6. 4 4 # 5 5 # Report bugs to <dip@lists.coin-or.org>. … … 441 441 PACKAGE_NAME='Dip' 442 442 PACKAGE_TARNAME='dip' 443 PACKAGE_VERSION='0.9. 5'444 PACKAGE_STRING='Dip 0.9. 5'443 PACKAGE_VERSION='0.9.6' 444 PACKAGE_STRING='Dip 0.9.6' 445 445 PACKAGE_BUGREPORT='dip@lists.coin-or.org' 446 446 … … 1017 1017 # This message is too long to be a string in the A/UX 3.1 sh. 1018 1018 cat <<_ACEOF 1019 \`configure' configures Dip 0.9. 5to adapt to many kinds of systems.1019 \`configure' configures Dip 0.9.6 to adapt to many kinds of systems. 1020 1020 1021 1021 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1083 1083 if test -n "$ac_init_help"; then 1084 1084 case $ac_init_help in 1085 short | recursive ) echo "Configuration of Dip 0.9. 5:";;1085 short | recursive ) echo "Configuration of Dip 0.9.6:";; 1086 1086 esac 1087 1087 cat <<\_ACEOF … … 1288 1288 if $ac_init_version; then 1289 1289 cat <<\_ACEOF 1290 Dip configure 0.9. 51290 Dip configure 0.9.6 1291 1291 generated by GNU Autoconf 2.59 1292 1292 … … 1319 1319 running configure, to aid debugging if configure makes a mistake. 1320 1320 1321 It was created by Dip $as_me 0.9. 5, which was1321 It was created by Dip $as_me 0.9.6, which was 1322 1322 generated by GNU Autoconf 2.59. Invocation command line was 1323 1323 … … 1845 1845 1846 1846 # Capture libtool library version, if given. 1847 coin_libversion=2: 5:11847 coin_libversion=2:6:1 1848 1848 1849 1849 … … 4604 4604 # Define the identity of the package. 4605 4605 PACKAGE='dip' 4606 VERSION='0.9. 5'4606 VERSION='0.9.6' 4607 4607 4608 4608 … … 25710 25710 cat >&5 <<_CSEOF 25711 25711 25712 This file was extended by Dip $as_me 0.9. 5, which was25712 This file was extended by Dip $as_me 0.9.6, which was 25713 25713 generated by GNU Autoconf 2.59. Invocation command line was 25714 25714 … … 25776 25776 cat >>$CONFIG_STATUS <<_ACEOF 25777 25777 ac_cs_version="\\ 25778 Dip config.status 0.9. 525778 Dip config.status 0.9.6 25779 25779 configured by $0, generated by GNU Autoconf 2.59, 25780 25780 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/0.9.6/Dip/configure.ac
r1588 r1588 21 21 22 22 # name of project, version number, contact info 23 AC_INIT([Dip],[0.9. 5],[dip@lists.coin-or.org])23 AC_INIT([Dip],[0.9.6],[dip@lists.coin-or.org]) 24 24 25 25 # copyright for configure script … … 61 61 # externals. The following macro ensures that those externals are 62 62 # retrieved by svn if they are not there yet. 63 AC_COIN_PROJECTDIR_INIT(Dip,2: 5:1)63 AC_COIN_PROJECTDIR_INIT(Dip,2:6:1) 64 64 65 65 # Check if user wants to produce debugging code -
releases/0.9.6/Dip/setup.py
r1588 r1588 7 7 from os.path import join, dirname 8 8 9 PROJECT = ' dippy'10 VERSION = '1.9. 2'9 PROJECT = 'coinor.dippy' 10 VERSION = '1.9.6' 11 11 URL = 'https://projects.coin-or.org/Dip/wiki/Dippy' 12 12 AUTHOR_EMAIL = u'' … … 50 50 return libs 51 51 52 def get_frameworks(dir): 53 ''' 54 On OS X, return a list of linked frameworks. 55 ''' 56 with open(join(dir, 'share', 'coin', 57 'doc', 'Dip', 'dip_addlibs.txt')) as f: 58 link_line = f.read() 59 add_framework = False 60 frameworks = '' 61 for flag in link_line.split(): 62 if add_framework: 63 frameworks += '-framework ' + flag + ' ' 64 add_framework = False 65 if flag == '-framework': 66 add_framework = True 67 68 return frameworks 69 52 70 operatingSystem = sys.platform 53 71 if 'linux' in operatingSystem: … … 84 102 if operatingSystem is 'windows': 85 103 lib_dirs.append(join(coin_install_dir, 'lib', 'intel')) 104 if operatingSystem is 'mac': 105 os.environ['LDFLAGS'] = get_frameworks(coin_install_dir) 86 106 87 107 modules=[Extension('_dippy', -
releases/0.9.6/Dip/src
- Property svn:mergeinfo changed (with no actual effect on merging)
-
releases/0.9.6/Dip/src/config_dip_default.h
r1588 r1588 20 20 21 21 /* Version number of project */ 22 #define DIP_VERSION "0.9. 5"22 #define DIP_VERSION "0.9.6" 23 23 24 24 /* Major Version number of project */ … … 29 29 30 30 /* Release Version number of project */ 31 #define DIP_VERSION_RELEASE 531 #define DIP_VERSION_RELEASE 6 32 32 -
releases/0.9.6/configure
r1588 r1588 2 2 # From configure.ac 0.8. 3 3 # Guess values for system-dependent variables and create Makefiles. 4 # Generated by GNU Autoconf 2.59 for Dip 0.9. 5.4 # Generated by GNU Autoconf 2.59 for Dip 0.9.6. 5 5 # 6 6 # Report bugs to <dip@lists.coin-or.org>. … … 442 442 PACKAGE_NAME='Dip' 443 443 PACKAGE_TARNAME='dip' 444 PACKAGE_VERSION='0.9. 5'445 PACKAGE_STRING='Dip 0.9. 5'444 PACKAGE_VERSION='0.9.6' 445 PACKAGE_STRING='Dip 0.9.6' 446 446 PACKAGE_BUGREPORT='dip@lists.coin-or.org' 447 447 … … 1046 1046 # This message is too long to be a string in the A/UX 3.1 sh. 1047 1047 cat <<_ACEOF 1048 \`configure' configures Dip 0.9. 5to adapt to many kinds of systems.1048 \`configure' configures Dip 0.9.6 to adapt to many kinds of systems. 1049 1049 1050 1050 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1112 1112 if test -n "$ac_init_help"; then 1113 1113 case $ac_init_help in 1114 short | recursive ) echo "Configuration of Dip 0.9. 5:";;1114 short | recursive ) echo "Configuration of Dip 0.9.6:";; 1115 1115 esac 1116 1116 cat <<\_ACEOF … … 1321 1321 if $ac_init_version; then 1322 1322 cat <<\_ACEOF 1323 Dip configure 0.9. 51323 Dip configure 0.9.6 1324 1324 generated by GNU Autoconf 2.59 1325 1325 … … 1352 1352 running configure, to aid debugging if configure makes a mistake. 1353 1353 1354 It was created by Dip $as_me 0.9. 5, which was1354 It was created by Dip $as_me 0.9.6, which was 1355 1355 generated by GNU Autoconf 2.59. Invocation command line was 1356 1356 … … 5164 5164 # Define the identity of the package. 5165 5165 PACKAGE='dip' 5166 VERSION='0.9. 5'5166 VERSION='0.9.6' 5167 5167 5168 5168 … … 22773 22773 cat >&5 <<_CSEOF 22774 22774 22775 This file was extended by Dip $as_me 0.9. 5, which was22775 This file was extended by Dip $as_me 0.9.6, which was 22776 22776 generated by GNU Autoconf 2.59. Invocation command line was 22777 22777 … … 22831 22831 cat >>$CONFIG_STATUS <<_ACEOF 22832 22832 ac_cs_version="\\ 22833 Dip config.status 0.9. 522833 Dip config.status 0.9.6 22834 22834 configured by $0, generated by GNU Autoconf 2.59, 22835 22835 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/0.9.6/configure.ac
r1588 r1588 21 21 22 22 # name of project, version number, contact info 23 AC_INIT([Dip],[0.9. 5],[dip@lists.coin-or.org])23 AC_INIT([Dip],[0.9.6],[dip@lists.coin-or.org]) 24 24 25 25 # copyright for configure script
Note: See TracChangeset
for help on using the changeset viewer.