mod-python-windows Commit Details

Date:

2013-11-07 19:56:21 (11 years 8 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

5867b5d27cfa0233dd713355d8de6036dd41c9c2

Parents:

21efb7698a1c7ea6232e40e8f2e244172343615b

Message:

Updating project

Changes:

File differences

-52
53 53
54 54
55 
55
56 56
57 57
58 58
... ...
83 83
84 84
85 85
86 
87 
88 
89 86
87
90 88
91 89
92 90
+    </ClCompile>␍␊
    <Link>␍␊
      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>␍␊
      <AdditionalDependencies>libhttpd.lib;libapr.lib;libaprutil.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>␍␊
      <AdditionalDependencies>libhttpd.lib;apr-1.lib;libapriconv-1.lib;libapr-1.lib;libaprutil-1.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>␍␊
      <OutputFile>.\Release/mod_python.so</OutputFile>␍␊
      <SuppressStartupBanner>true</SuppressStartupBanner>␍␊
      <AdditionalLibraryDirectories>$(APACHESRC)\lib;$(PYTHONSRC)\libs;C:\Users\nathan\Downloads\httpd-2.4.6-win32-ssl_0.9.8\Apache24\lib;C:\Python27\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>␍␊

    <ClInclude Include="include\util.h" />␍␊
  </ItemGroup>␍␊
  <ItemGroup>␍␊
    <ResourceCompile Include="Version.rc" />␍␊
  </ItemGroup>␍␊
  <ItemGroup>␍␊
    <ClCompile Include="finfoobject.c" />␍␊
    <ClCompile Include="version.c" />␍␊
    <ClCompile Include="_apachemodule.c" />␍␊
    <ClCompile Include="connobject.c" />␍␊
    <ClCompile Include="filterobject.c" />␍␊
 ...
     </ClCompile>␍␊
     <Link>␍␊
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>␍␊
-      <AdditionalDependencies>libhttpd.lib;libapr.lib;libaprutil.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>␍␊
+      <AdditionalDependencies>libhttpd.lib;apr-1.lib;libapriconv-1.lib;libapr-1.lib;libaprutil-1.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>␍␊
       <OutputFile>.\Release/mod_python.so</OutputFile>␍␊
       <SuppressStartupBanner>true</SuppressStartupBanner>␍␊
       <AdditionalLibraryDirectories>$(APACHESRC)\lib;$(PYTHONSRC)\libs;C:\Users\nathan\Downloads\httpd-2.4.6-win32-ssl_0.9.8\Apache24\lib;C:\Python27\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>␍␊
     <ClInclude Include="include\util.h" />␍␊
   </ItemGroup>␍␊
   <ItemGroup>␍␊
-    <ResourceCompile Include="Version.rc" />␍␊
-  </ItemGroup>␍␊
-  <ItemGroup>␍␊
     <ClCompile Include="finfoobject.c" />␍␊
+    <ClCompile Include="version.c" />␍␊
     <ClCompile Include="_apachemodule.c" />␍␊
     <ClCompile Include="connobject.c" />␍␊
     <ClCompile Include="filterobject.c" />␍␊

-35
36 36
37 37
38 
39 
40 
41 38
42 39
43 40
... ...
49 46
50 47
51 48
49
52 50
53 51
+    </ClInclude>␍␊
  </ItemGroup>␍␊
  <ItemGroup>␍␊
    <ResourceCompile Include="Version.rc" />␍␊
  </ItemGroup>␍␊
  <ItemGroup>␍␊
    <ClCompile Include="_apachemodule.c" />␍␊
    <ClCompile Include="connobject.c" />␍␊
    <ClCompile Include="filterobject.c" />␍␊

    <ClCompile Include="tableobject.c" />␍␊
    <ClCompile Include="util.c" />␍␊
    <ClCompile Include="finfoobject.c" />␍␊
    <ClCompile Include="version.c" />␍␊
  </ItemGroup>␍␊
</Project>
 ...
     </ClInclude>␍␊
   </ItemGroup>␍␊
   <ItemGroup>␍␊
-    <ResourceCompile Include="Version.rc" />␍␊
-  </ItemGroup>␍␊
-  <ItemGroup>␍␊
     <ClCompile Include="_apachemodule.c" />␍␊
     <ClCompile Include="connobject.c" />␍␊
     <ClCompile Include="filterobject.c" />␍␊
     <ClCompile Include="tableobject.c" />␍␊
     <ClCompile Include="util.c" />␍␊
     <ClCompile Include="finfoobject.c" />␍␊
+    <ClCompile Include="version.c" />␍␊
   </ItemGroup>␍␊
 </Project>

-
2
3
4
5
6
7
8
+/* THIS FILE IS AUTO-GENERATED BY Makefile */␍␊
#include "mp_version.h"␍␊
const char * const mp_git_sha = "54d42b1";␍␊
const int mp_version_major = MP_VERSION_MAJOR;␍␊
const int mp_version_minor = MP_VERSION_MINOR;␍␊
const int mp_version_patch = MP_VERSION_PATCH;␍␊
const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) "-54d42b1";␍␊
const char * const mp_version_component = "mod_python/" MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) "-54d42b1";
+/* THIS FILE IS AUTO-GENERATED BY Makefile */␍␊
+#include "mp_version.h"␍␊
+const char * const mp_git_sha = "54d42b1";␍␊
+const int mp_version_major = MP_VERSION_MAJOR;␍␊
+const int mp_version_minor = MP_VERSION_MINOR;␍␊
+const int mp_version_patch = MP_VERSION_PATCH;␍␊
+const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) "-54d42b1";␍␊
+const char * const mp_version_component = "mod_python/" MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) "-54d42b1";

Download the corresponding diff file

mod-python-windows

File differences

Branches