James Moger
2013-03-28 dbf594ea99c7c742ced3973285d263cc7bdecebd
Restored missing Windows distrib files lost during the refactor
4 files added
4 files modified
40 ■■■■ changed files
.classpath 2 ●●●●● patch | view | raw | blame | history
build.moxie 3 ●●●●● patch | view | raw | blame | history
build.xml 15 ●●●● patch | view | raw | blame | history
gitblit.iml 20 ●●●●● patch | view | raw | blame | history
src/main/distrib/win/amd64/gitblit.exe patch | view | raw | blame | history
src/main/distrib/win/gitblitw.exe patch | view | raw | blame | history
src/main/distrib/win/ia64/gitblit.exe patch | view | raw | blame | history
src/main/distrib/win/x86/gitblit.exe patch | view | raw | blame | history
.classpath
@@ -36,8 +36,6 @@
    <classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
    <classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar" />
    <classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0.jar" />
    <classpathentry kind="lib" path="ext/commons-daemon-1.0.14.jar" sourcepath="ext/src/commons-daemon-1.0.14.jar" />
    <classpathentry kind="lib" path="ext/commons-daemon-1.0.14-bin-windows.zip" />
    <classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
    <classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />
    <classpathentry kind="lib" path="ext/selenium-java-2.28.0.jar" sourcepath="ext/src/selenium-java-2.28.0.jar" />
build.moxie
@@ -147,9 +147,6 @@
- compile 'org.apache.ivy:ivy:2.2.0' :war
- compile 'com.toedter:jcalendar:1.3.2' :authority
- compile 'org.apache.commons:commons-compress:1.4.1' :war
# Commons Daemon is for launching services
- provided 'commons-daemon:commons-daemon:1.0.14'
- provided 'commons-daemon:commons-daemon:1.0.14:bin-windows:zip'
- test 'junit'
# Dependencies for Selenium web page testing
- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
build.xml
@@ -214,8 +214,10 @@
                <include name="LICENSE" />
                <include name="NOTICE" />
            </fileset>
            <!-- Distrib files -->
            <!-- Windows distrib files -->
            <zipfileset dir="${project.distrib.dir}/win" />
            <!-- Gitblit Authority data -->
            <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
            <!-- include all dependencies -->
            <dependencies prefix="ext" />
        </mx:zip>
@@ -227,8 +229,10 @@
                <include name="LICENSE" />
                <include name="NOTICE" />
            </fileset>
            <!-- Distrib files -->
            <!-- Linux/OSX distrib files -->
            <tarfileset dir="${project.distrib.dir}/linux" filemode="755" />
            <!-- Gitblit Authority data -->
            <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
            <!-- include all dependencies -->
            <dependencies prefix="ext" />
        </mx:tar>        
@@ -518,11 +522,8 @@
                <include name="users.conf" />
                <include name="gitblit.properties" />
            </zipfileset>
            <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs">
                <include name="authority.conf" />
                <include name="mail.tmpl" />
                <include name="instructions.tmpl" />
            </zipfileset>
            <!-- Gitblit Authority data -->
            <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
            <!-- include "authority" tagged dependencies -->
            <dependencies prefix="ext" tag="authority" />
        </mx:zip>
gitblit.iml
@@ -369,26 +369,6 @@
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library" scope="PROVIDED">
      <library name="commons-daemon-1.0.14.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/commons-daemon-1.0.14.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library" scope="PROVIDED">
      <library name="commons-daemon-1.0.14-bin-windows.zip">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14-bin-windows.zip!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
      </library>
    </orderEntry>
    <orderEntry type="module-library" scope="TEST">
      <library name="junit-4.11.jar">
        <CLASSES>
src/main/distrib/win/amd64/gitblit.exe
Binary files differ
src/main/distrib/win/gitblitw.exe
Binary files differ
src/main/distrib/win/ia64/gitblit.exe
Binary files differ
src/main/distrib/win/x86/gitblit.exe
Binary files differ