fix error in makefile
This commit is contained in:
9
Makefile
9
Makefile
@@ -9,7 +9,7 @@ preset=`rm .version; make version`
|
|||||||
|
|
||||||
PROFILE_VERSION=$(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONBUILD)
|
PROFILE_VERSION=$(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONBUILD)
|
||||||
|
|
||||||
all: version prep install.exe
|
all: version install.exe
|
||||||
|
|
||||||
fmt:
|
fmt:
|
||||||
find . -name '*.java' -exec clang-format -i {} \;
|
find . -name '*.java' -exec clang-format -i {} \;
|
||||||
@@ -19,7 +19,7 @@ tag:
|
|||||||
|
|
||||||
version:
|
version:
|
||||||
./buildscripts/version.sh
|
./buildscripts/version.sh
|
||||||
make version.txt "$SCRIPT_DIR
|
make version.txt
|
||||||
|
|
||||||
version.txt: build
|
version.txt: build
|
||||||
echo "$(PROFILE_VERSION)" > build/version.txt
|
echo "$(PROFILE_VERSION)" > build/version.txt
|
||||||
@@ -44,7 +44,7 @@ prep:
|
|||||||
echo "nsi2" >> make.log
|
echo "nsi2" >> make.log
|
||||||
cp src/icons/*.ico build
|
cp src/icons/*.ico build
|
||||||
|
|
||||||
install.exe: #build/licenses
|
install.exe: prep
|
||||||
cd build && makensis i2pbrowser-installer.nsi && cp I2P-Easy-Install-Bundle-*.exe ../ && echo "built windows installer"
|
cd build && makensis i2pbrowser-installer.nsi && cp I2P-Easy-Install-Bundle-*.exe ../ && echo "built windows installer"
|
||||||
|
|
||||||
export RES_DIR="../i2p.i2p.jpackage-build/installer/resources"
|
export RES_DIR="../i2p.i2p.jpackage-build/installer/resources"
|
||||||
@@ -62,9 +62,6 @@ build/I2P: I2P build
|
|||||||
src/I2P/config:
|
src/I2P/config:
|
||||||
|
|
||||||
build/I2P/config: src/I2P/config build/I2P
|
build/I2P/config: src/I2P/config build/I2P
|
||||||
# cp -rv src/I2P/config build/I2P/config
|
|
||||||
# cp -rv build/I2P/* I2P/
|
|
||||||
# cp -rv src/I2P/config build/I2P/.i2p
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Warning: a displayed license file of more than 28752 bytes
|
# Warning: a displayed license file of more than 28752 bytes
|
||||||
|
|||||||
0
buildscripts/licenses.sh
Normal file → Executable file
0
buildscripts/licenses.sh
Normal file → Executable file
@@ -18,7 +18,7 @@ fi
|
|||||||
echo "!define VERSIONMAJOR $VERSIONMAJOR" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
|
echo "!define VERSIONMAJOR $VERSIONMAJOR" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
|
||||||
echo "!define VERSIONMINOR $VERSIONMINOR" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
|
echo "!define VERSIONMINOR $VERSIONMINOR" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
|
||||||
echo "!define VERSIONBUILD $VERSIONBUILD" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
|
echo "!define VERSIONBUILD $VERSIONBUILD" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
|
||||||
echo "!define I2P_VERSION $PROFILE_VERSION" > "$SCRIPT_DIR"src/nsis/i2pbrowser-jpackage.nsi
|
echo "!define I2P_VERSION $PROFILE_VERSION" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-jpackage.nsi
|
||||||
|
|
||||||
echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
|
echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
|
||||||
echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
|
echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
|
||||||
|
|||||||
0
buildscripts/zip.sh
Normal file → Executable file
0
buildscripts/zip.sh
Normal file → Executable file
@@ -1 +1 @@
|
|||||||
!define I2P_VERSION 2.1.0
|
!define I2P_VERSION
|
||||||
|
|||||||
Reference in New Issue
Block a user