News:

Simutrans Wiki Manual
The official on-line manual for Simutrans. Read and contribute.

ground.outside - duplicate definition

Started by Vladki, July 06, 2016, 10:08:10 PM

Previous topic - Next topic

0 Members and 1 Guest are viewing this topic.

Vladki

This patch got lost in the thread about experimental server. The object ground.outside is defined in a dat file, and generated on the fly from makefile. As a result pakset compiled on different computers were not consistent. Makefile generation disabled:


diff --git a/Makefile b/Makefile
index e88941d..2b5d446 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# to get fresh and ready to deploy .tbz2 and .zip archives
#
# Change THIS to change the version string encoded in the pak file
-VERSION_STRING = "pak128.Britain-Ex-0.9.2"
+# VERSION_STRING = "pak128.Britain-Ex-0.9.2"
#
#
#
@@ -157,11 +157,11 @@ $(OUTSIDE):
        @echo "===> OUTSIDE with REVISION and grounds"
        @mkdir -p $(PAKDIR)
        @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/ > /dev/null
-       @echo -e "Obj=ground\nName=Outside\ncopyright=$(VERSION_STRING)" >$@/outsiderev.dat
-       #@svnversion >>$@/outsiderev.dat
-       @echo -e "Image[0][0]=images/ls-water-outside-128.0.0\n-" >>$@/outsiderev.dat
-       @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/outsiderev.dat > /dev/null
-       @rm $@/outsiderev.dat
+#      @echo -e "Obj=ground\nName=Outside\ncopyright=$(VERSION_STRING)" >$@/outsiderev.dat
+#      #@svnversion >>$@/outsiderev.dat
+#      @echo -e "Image[0][0]=images/ls-water-outside-128.0.0\n-" >>$@/outsiderev.dat
+#      @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/outsiderev.dat > /dev/null
+#      @rm $@/outsiderev.dat

clean:
        @echo "===> CLEAN"


jamespetts

Thank you for the report. I am having trouble finding more than one of the following:


VERSION_STRING = "pak128.Britain-Ex-0.9.2"


May I ask where the other is located?
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Vladki


jamespetts

Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Vladki

This patch was not applied completely. Here is the missing part:


diff --git a/Makefile b/Makefile
index 5b1fa14..5753835 100644
--- a/Makefile
+++ b/Makefile
@@ -156,12 +156,7 @@ $(DIRS256):
$(OUTSIDE):
        @echo "===> OUTSIDE with REVISION and grounds"
        @mkdir -p $(PAKDIR)
-       @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/ > /dev/null
-       @echo -e "Obj=ground\nName=Outside\ncopyright=$(VERSION_STRING)" >$@/outsiderev.dat
-       #@svnversion >>$@/outsiderev.dat
-       @echo -e "Image[0][0]=images/ls-water-outside-128.0.0\n-" >>$@/outsiderev.dat
-       @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/outsiderev.dat > /dev/null
-       @rm $@/outsiderev.dat
+       @$(MAKEOBJ) quiet PAK128 $(PAKDIR)/ $@/ > /dev/null

clean:
        @echo "===> CLEAN"


I hoped it will help with the desync issue, but it does not...

jamespetts

Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Vladki

#6
James please, remove the old makeobj-experimental from the pakset repository.

Thanks for the fix, but I think that the line:
@mkdir -p $(PAKDIR)
should not  be removed