Skip to content

Commit 76fb8ab

Browse files
committed
Moved some files around for creating dists. Removed extensions on license and notice files but kept seperated by folder location.
1 parent 2dee9a5 commit 76fb8ab

27 files changed

+33
-8
lines changed

LICENSE.src LICENSE

File renamed without changes.

NOTICE.src NOTICE

File renamed without changes.

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,10 @@ For example, to override wave\_server\_domain run:
127127
Take a look at the reference.conf to learn about configuration and possible/default values.
128128

129129
The server can be started (on Linux/MacOS) by running
130-
./run-server.sh (currently disabled please use gradle method)
130+
./run-server.sh
131131
Or on Windows by running
132-
run-server.bat (currently disabled please use gradle method)
132+
run-server.bat
133+
Note: must be cd'ed into the root directory
133134
Or, you can run the server from the compiled classes with Gradle:
134135
gradle run
135136
The web client will be accessible by default at http://localhost:9898/.
File renamed without changes.

build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ rat.doFirst {
8383
task createDistSourceZip(type: Zip) {
8484
baseName = "apache-wave-source"
8585
from('./') {
86-
into ''
86+
into 'apache-wave-src'
8787
}
8888
excludes = [
89-
'apache-wave-source.zip',
90-
'apache-wave-source.tar',
89+
'apache-wave-src.zip',
90+
'apache-wave-src.tar',
9191
'.gradle/',
9292
'.git/',
9393
'.vagrant/',
@@ -104,11 +104,11 @@ task createDistSourceZip(type: Zip) {
104104
task createDistSourceTar(type: Tar) {
105105
baseName = "apache-wave-source"
106106
from('./') {
107-
into ''
107+
into 'apache-wave-src'
108108
}
109109
excludes = [
110-
'apache-wave-source.zip',
111-
'apache-wave-source.tar',
110+
'apache-wave-src.zip',
111+
'apache-wave-src.tar',
112112
'.gradle/',
113113
'.git/',
114114
'.vagrant/',

wave/build.gradle

+24
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,18 @@ task createDistZip(type: Zip) {
558558
from('war') {
559559
into 'apache-wave/war'
560560
}
561+
from('../THANKS') {
562+
into 'apache-wave'
563+
}
564+
from('../RELEASE-NOTES') {
565+
into 'apache-wave'
566+
}
567+
from('../KEYS') {
568+
into 'apache-wave'
569+
}
570+
from('../DISCLAIMER') {
571+
into 'apache-wave'
572+
}
561573
}
562574

563575
task createDistTar(type: Tar) {
@@ -573,6 +585,18 @@ task createDistTar(type: Tar) {
573585
from('war') {
574586
into 'apache-wave/war'
575587
}
588+
from('../THANKS') {
589+
into 'apache-wave'
590+
}
591+
from('../RELEASE-NOTES') {
592+
into 'apache-wave'
593+
}
594+
from('../KEYS') {
595+
into 'apache-wave'
596+
}
597+
from('../DISCLAIMER') {
598+
into 'apache-wave'
599+
}
576600
}
577601

578602
createDistZip.dependsOn jar, createPropertiesFile
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)